From 3f90a2968d9f463567dd794856bfaff3c42d184a Mon Sep 17 00:00:00 2001
From: mark <markc@tencastle.com>
Date: Mon, 15 Jun 2020 12:35:07 +0100
Subject: [PATCH] TS 103 221-1 v1.5.1 (2019-07-30) agreed at LI#51 (Texel,
 2019-06-11)

---
 103221-1/TS_103_221_01.xsd                    | 1646 ++++++++---------
 .../examples/ActivateTaskRequest_example.xml  |    2 +-
 .../examples/ActivateTaskResponse_example.xml |    2 +-
 .../CreateDestinationRequest_example.xml      |    2 +-
 .../CreateDestinationResponse_example.xml     |    2 +-
 .../DeactivateTaskRequest_example.xml         |    2 +-
 .../DeactivateTaskResponse_example.xml        |    2 +-
 .../examples/GetAllDetailsRequest_example.xml |    2 +-
 .../GetAllDetailsResponse_example.xml         |    2 +-
 .../GetDestinationDetailsRequest_example.xml  |    2 +-
 .../GetDestinationDetailsResponse_example.xml |    2 +-
 .../examples/GetNEStatusRequest_example.xml   |    2 +-
 .../examples/GetNEStatusResponse_example.xml  |    2 +-
 .../GetTaskDetailsRequest_example.xml         |    2 +-
 .../GetTaskDetailsResponse_example.xml        |    2 +-
 .../examples/KeepaliveRequest_example.xml     |    2 +-
 .../examples/KeepaliveResponse_example.xml    |    2 +-
 .../ListAllDetailsRequest_example.xml         |    4 +-
 .../ListAllDetailsResponse_example.xml        |    4 +-
 .../examples/ModifyTaskRequest_example.xml    |    2 +-
 .../examples/ModifyTaskResponse_example.xml   |    2 +-
 103221-1/examples/PingRequest_example.xml     |    2 +-
 103221-1/examples/PingResponse_example.xml    |    2 +-
 .../RemoveAllDestinationsRequest_example.xml  |    2 +-
 .../RemoveAllDestinationsResponse_example.xml |    2 +-
 .../RemoveDestinationRequest_example.xml      |    4 +-
 .../RemoveDestinationResponse_example.xml     |    2 +-
 .../ReportDestinationIssueRequest_example.xml |    2 +-
 ...ReportDestinationIssueResponse_example.xml |    2 +-
 .../examples/ReportNEIssueRequest_example.xml |    2 +-
 .../ReportNEIssueResponse_example.xml         |    2 +-
 .../ReportTaskIssueRequest_example.xml        |    2 +-
 .../ReportTaskIssueResponse_example.xml       |    2 +-
 103221-1/examples/validate_examples.py        |   93 +
 .../ActivateTaskRequest_example.xml           |    2 +-
 .../ActivateTaskResponse_example.xml          |    2 +-
 .../CreateDestinationRequest_example.xml      |    2 +-
 .../CreateDestinationResponse_example.xml     |    2 +-
 .../DeactivateTaskRequest_example.xml         |    2 +-
 .../DeactivateTaskResponse_example.xml        |    2 +-
 .../GetAllDetailsRequest_example.xml          |    2 +-
 .../GetAllDetailsResponse_example.xml         |    2 +-
 .../GetDestinationDetailsRequest_example.xml  |    2 +-
 .../GetDestinationDetailsResponse_example.xml |    2 +-
 .../GetNEStatusRequest_example.xml            |    2 +-
 .../GetNEStatusResponse_example.xml           |    2 +-
 .../GetTaskDetailsRequest_example.xml         |    2 +-
 .../GetTaskDetailsResponse_example.xml        |    2 +-
 .../{output => }/KeepaliveRequest_example.xml |    2 +-
 .../KeepaliveResponse_example.xml             |    2 +-
 .../ListAllDetailsRequest_example.xml         |    4 +-
 .../ListAllDetailsResponse_example.xml        |    4 +-
 .../ModifyTaskRequest_example.xml             |    2 +-
 .../ModifyTaskResponse_example.xml            |    2 +-
 .../{output => }/PingRequest_example.xml      |    2 +-
 .../{output => }/PingResponse_example.xml     |    2 +-
 .../RemoveAllDestinationsRequest_example.xml  |    2 +-
 .../RemoveAllDestinationsResponse_example.xml |    2 +-
 .../RemoveDestinationRequest_example.xml      |    4 +-
 .../RemoveDestinationResponse_example.xml     |    2 +-
 .../ReportDestinationIssueRequest_example.xml |    2 +-
 ...ReportDestinationIssueResponse_example.xml |    2 +-
 .../ReportNEIssueRequest_example.xml          |    2 +-
 .../ReportNEIssueResponse_example.xml         |    2 +-
 .../ReportTaskIssueRequest_example.xml        |    2 +-
 .../ReportTaskIssueResponse_example.xml       |    2 +-
 103221-1/portal/TS_103_221_01_v010401.xsd     |  861 ---------
 103221-1/portal/TS_103_221_01_v010501.xsd     |  789 ++++++++
 103221-1/portal/validate_examples.py          |   93 +
 69 files changed, 1832 insertions(+), 1790 deletions(-)
 create mode 100644 103221-1/examples/validate_examples.py
 rename 103221-1/portal/{output => }/ActivateTaskRequest_example.xml (96%)
 rename 103221-1/portal/{output => }/ActivateTaskResponse_example.xml (93%)
 rename 103221-1/portal/{output => }/CreateDestinationRequest_example.xml (96%)
 rename 103221-1/portal/{output => }/CreateDestinationResponse_example.xml (93%)
 rename 103221-1/portal/{output => }/DeactivateTaskRequest_example.xml (93%)
 rename 103221-1/portal/{output => }/DeactivateTaskResponse_example.xml (93%)
 rename 103221-1/portal/{output => }/GetAllDetailsRequest_example.xml (93%)
 rename 103221-1/portal/{output => }/GetAllDetailsResponse_example.xml (98%)
 rename 103221-1/portal/{output => }/GetDestinationDetailsRequest_example.xml (93%)
 rename 103221-1/portal/{output => }/GetDestinationDetailsResponse_example.xml (97%)
 rename 103221-1/portal/{output => }/GetNEStatusRequest_example.xml (92%)
 rename 103221-1/portal/{output => }/GetNEStatusResponse_example.xml (94%)
 rename 103221-1/portal/{output => }/GetTaskDetailsRequest_example.xml (93%)
 rename 103221-1/portal/{output => }/GetTaskDetailsResponse_example.xml (96%)
 rename 103221-1/portal/{output => }/KeepaliveRequest_example.xml (92%)
 rename 103221-1/portal/{output => }/KeepaliveResponse_example.xml (93%)
 rename 103221-1/portal/{output => }/ListAllDetailsRequest_example.xml (78%)
 rename 103221-1/portal/{output => }/ListAllDetailsResponse_example.xml (84%)
 rename 103221-1/portal/{output => }/ModifyTaskRequest_example.xml (96%)
 rename 103221-1/portal/{output => }/ModifyTaskResponse_example.xml (93%)
 rename 103221-1/portal/{output => }/PingRequest_example.xml (92%)
 rename 103221-1/portal/{output => }/PingResponse_example.xml (93%)
 rename 103221-1/portal/{output => }/RemoveAllDestinationsRequest_example.xml (93%)
 rename 103221-1/portal/{output => }/RemoveAllDestinationsResponse_example.xml (93%)
 rename 103221-1/portal/{output => }/RemoveDestinationRequest_example.xml (81%)
 rename 103221-1/portal/{output => }/RemoveDestinationResponse_example.xml (93%)
 rename 103221-1/portal/{output => }/ReportDestinationIssueRequest_example.xml (95%)
 rename 103221-1/portal/{output => }/ReportDestinationIssueResponse_example.xml (93%)
 rename 103221-1/portal/{output => }/ReportNEIssueRequest_example.xml (94%)
 rename 103221-1/portal/{output => }/ReportNEIssueResponse_example.xml (93%)
 rename 103221-1/portal/{output => }/ReportTaskIssueRequest_example.xml (94%)
 rename 103221-1/portal/{output => }/ReportTaskIssueResponse_example.xml (93%)
 delete mode 100644 103221-1/portal/TS_103_221_01_v010401.xsd
 create mode 100644 103221-1/portal/TS_103_221_01_v010501.xsd
 create mode 100644 103221-1/portal/validate_examples.py

diff --git a/103221-1/TS_103_221_01.xsd b/103221-1/TS_103_221_01.xsd
index ef56282..cb1ebf0 100644
--- a/103221-1/TS_103_221_01.xsd
+++ b/103221-1/TS_103_221_01.xsd
@@ -1,861 +1,789 @@
 <?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" targetNamespace="http://uri.etsi.org/03221/X1/2017/10" xmlns:etsi103280="http://uri.etsi.org/03280/common/2017/07" version="1.4.1" elementFormDefault="qualified">
-  <xs:import namespace="http://uri.etsi.org/03280/common/2017/07"></xs:import>
-
-  <!-- Message containers -->
-  <xs:element name="X1Request" type="RequestContainer"></xs:element>
-  <xs:element name="X1Response" type="ResponseContainer"></xs:element>
-  <xs:element name="X1TopLevelErrorResponse" type="TopLevelErrorResponse"></xs:element>
-
-
-  <xs:complexType name="RequestContainer">
-    <xs:sequence>
-      <xs:element name="x1RequestMessage" type="X1RequestMessage" minOccurs="1" maxOccurs="unbounded"></xs:element>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="ResponseContainer">
-    <xs:sequence>
-      <xs:element name="x1ResponseMessage" type="X1ResponseMessage" minOccurs="1" maxOccurs="unbounded"></xs:element>
-    </xs:sequence>
-  </xs:complexType>
-  
-  <!-- Top-level Message definitions -->
-
-  <!-- See section 6.1 -->
-  <xs:complexType name="X1RequestMessage">
-    <xs:sequence>
-      <xs:element name="admfIdentifier" type="AdmfIdentifier"></xs:element>
-      <xs:element name="neIdentifier" type="NeIdentifier"></xs:element>
-      <xs:element name="messageTimestamp" type="etsi103280:QualifiedMicrosecondDateTime"></xs:element>
-      <xs:element name="version" type="Version"></xs:element>
-      <xs:element name="x1TransactionId" type="X1TransactionId"></xs:element>
-    </xs:sequence>
-  </xs:complexType>
- 
-  <!-- See section 6.1 -->
-  <xs:complexType name="X1ResponseMessage">
-    <xs:sequence>
-      <xs:element name="admfIdentifier" type="AdmfIdentifier"></xs:element>
-      <xs:element name="neIdentifier" type="NeIdentifier"></xs:element>
-      <xs:element name="messageTimestamp" type="etsi103280:QualifiedMicrosecondDateTime"></xs:element>
-      <xs:element name="version" type="Version"></xs:element>
-      <xs:element name="x1TransactionId" type="X1TransactionId"></xs:element>
-    </xs:sequence>
-  </xs:complexType>
-
-
-  <!-- See section 5.1 -->
-  <xs:simpleType name="XId">
-    <xs:restriction base="etsi103280:UUID"></xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="DId">
-    <xs:restriction base="etsi103280:UUID"></xs:restriction>
-  </xs:simpleType>
-
-  <!-- See section 5.2 -->
-  <xs:simpleType name="X1TransactionId">
-    <xs:restriction base="etsi103280:UUID"></xs:restriction>
-  </xs:simpleType>
-
-  <!-- See section 6.1 -->
-  <xs:simpleType name="AdmfIdentifier">
-    <xs:restriction base="xs:token"></xs:restriction>
-  </xs:simpleType>
-
-  <!-- See section 6.1 -->
-  <xs:simpleType name="NeIdentifier">
-    <xs:restriction base="xs:token"></xs:restriction>
-  </xs:simpleType>
-
-  <!-- See section 6.1 -->
-  <xs:simpleType name="Version">
-    <xs:restriction base="xs:string">
-      <xs:pattern value="v1.4.1"></xs:pattern>
-    </xs:restriction>
-  </xs:simpleType>
-
-
-  <!-- Error Reponse -->
-
-  <xs:complexType name="TopLevelErrorResponse">
-    <xs:sequence>
-      <xs:element name="admfIdentifier" type="AdmfIdentifier"></xs:element>
-      <xs:element name="neIdentifier" type="NeIdentifier"></xs:element>
-      <xs:element name="messageTimestamp" type="etsi103280:QualifiedMicrosecondDateTime"></xs:element>
-      <xs:element name="version" type="Version"></xs:element>
-    </xs:sequence>
-  </xs:complexType>
-  
-  <!-- see section 6.7 -->
-  <xs:complexType name="ErrorResponse">
-    <xs:complexContent>
-      <xs:extension base="X1ResponseMessage">
-        <xs:sequence>
-          <xs:element name="requestMessageType" type="RequestMessageType"></xs:element>
-          <xs:element name="errorInformation" type="ErrorInformation"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:simpleType name="RequestMessageType">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="ActivateTask"></xs:enumeration>
-      <xs:enumeration value="ModifyTask"></xs:enumeration>
-      <xs:enumeration value="DeactivateTask"></xs:enumeration>
-      <xs:enumeration value="DdeactivateAllTasks"></xs:enumeration>
-      <xs:enumeration value="GetTaskDetails"></xs:enumeration>
-      <xs:enumeration value="CreateDestination"></xs:enumeration>
-      <xs:enumeration value="ModifyDestination"></xs:enumeration>
-      <xs:enumeration value="RemoveDestination"></xs:enumeration>
-      <xs:enumeration value="RemoveAllDestinations"></xs:enumeration>
-      <xs:enumeration value="GetDestinationDetails"></xs:enumeration>
-      <xs:enumeration value="GetNEStatus"></xs:enumeration>
-      <xs:enumeration value="GetAllDetails"></xs:enumeration>
-      <xs:enumeration value="ListAllDetails"></xs:enumeration>
-      <xs:enumeration value="ReportTaskIssue"></xs:enumeration>
-      <xs:enumeration value="ReportDestinationIssue"></xs:enumeration>
-      <xs:enumeration value="ReportNEIssue"></xs:enumeration>
-      <xs:enumeration value="Ping"></xs:enumeration>
-      <xs:enumeration value="Keepalive"></xs:enumeration>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:complexType name="ErrorInformation">
-    <xs:sequence>
-      <xs:element name="errorCode" type="xs:integer"></xs:element>
-      <xs:element name="errorDescription" type="xs:string"></xs:element>
-    </xs:sequence>
-  </xs:complexType>
-  
-
-  <!-- Individual Message Definitions -->
-  
-  <!-- see section 6.2.1 -->
-  <xs:complexType name="ActivateTaskRequest">
-    <xs:complexContent>
-      <xs:extension base="X1RequestMessage">
-        <xs:sequence>
-          <xs:element name="taskDetails" type="TaskDetails"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <!-- see section 6.2.1.2 -->
-  <xs:complexType name="TaskDetails">
-    <xs:sequence>
-      <xs:element name="xId" type="XId"></xs:element>
-      <xs:element name="targetIdentifiers" type="ListOfTargetIdentifiers"></xs:element>
-      <xs:element name="deliveryType" type="DeliveryType"></xs:element>
-      <xs:element name="listOfDIDs" type="ListOfDids"></xs:element>
-      <xs:element name="listOfMediationDetails" type="ListOfMediationDetails" minOccurs="0"></xs:element>
-      <xs:element name="correlationID" type="xs:nonNegativeInteger" minOccurs="0"></xs:element>
-      <xs:element name="implicitDeactivationAllowed" type="xs:boolean" minOccurs="0"></xs:element>
-      <xs:element name="taskDetailsExtensions" type="TaskDetailsExtensions" minOccurs="0"></xs:element>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="ListOfTargetIdentifiers">
-    <xs:sequence>
-      <xs:element name="targetIdentifier" type="TargetIdentifier" minOccurs="1" maxOccurs="unbounded"></xs:element>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="TargetIdentifier">
-    <xs:choice>
-      <xs:element name="e164Number" type="etsi103280:InternationalE164"></xs:element>
-      <xs:element name="imsi" type="etsi103280:IMSI"></xs:element>
-      <xs:element name="imei" type="etsi103280:IMEI"></xs:element>
-      <xs:element name="macAddress" type="etsi103280:MACAddress"></xs:element>
-      <xs:element name="ipv4Address" type="etsi103280:IPv4Address"></xs:element>
-      <xs:element name="ipv6Address" type="etsi103280:IPv6Address"></xs:element>
-      <xs:element name="ipv4Cidr" type="etsi103280:IPCIDR"></xs:element>
-      <xs:element name="ipv6Cidr" type="etsi103280:IPv6CIDR"></xs:element>
-      <xs:element name="tcpPort" type="etsi103280:TCPPort"></xs:element>
-      <xs:element name="tcpPortRange" type="etsi103280:TCPPortRange"></xs:element>
-      <xs:element name="udpPort" type="etsi103280:UDPPort"></xs:element>
-      <xs:element name="udpPortRange" type="etsi103280:UDPPortRange"></xs:element>
-      <xs:element name="emailAddress" type="etsi103280:EmailAddress"></xs:element>
-      <xs:element name="sipUri" type="etsi103280:SIPURI"></xs:element>
-      <xs:element name="telUri" type="etsi103280:TELURI"></xs:element>
-      <xs:element name="h323Uri" type="H323Uri"></xs:element>
-      <xs:element name="impu" type="Impu"></xs:element>
-      <xs:element name="impi" type="Impi"></xs:element>
-      <xs:element name="nai" type="etsi103280:NAI"></xs:element>
-      <xs:element name="radiusAttribute" type="xs:hexBinary"></xs:element>
-      <xs:element name="gtpuTunnelId" type="GtpTunnelId"></xs:element>
-      <xs:element name="gtpcTunnelId" type="GtpTunnelId"></xs:element>
-      <xs:element name="callPartyRole" type="CallPartyRole"></xs:element>
-      <xs:element name="nonLocalIdentifier" type="NonLocalIdentifier"></xs:element>
-      <xs:element name="supiimsi" type="etsi103280:SUPIIMSI"></xs:element>
-      <xs:element name="supinai" type="etsi103280:SUPINAI"></xs:element>
-      <xs:element name="suci" type="etsi103280:SUCI"></xs:element>
-      <xs:element name="peiImei" type="etsi103280:PEIIMEI"></xs:element>
-      <xs:element name="peiImeiCheckDigit" type="etsi103280:PEIIMEICheckDigit"></xs:element>
-      <xs:element name="peiImeisv" type="etsi103280:PEIIMEISV"></xs:element>
-      <xs:element name="gpsiMsisdn" type="etsi103280:GPSIMSISDN"></xs:element>
-      <xs:element name="gpsiNai" type="etsi103280:GPSINAI"></xs:element>
-      <xs:element name="targetIdentifierExtension" type="TargetIdentifierExtension"></xs:element>
-    </xs:choice>
-  </xs:complexType>
-
-  <xs:simpleType name="H323Uri">
-    <xs:restriction base="xs:string">
-      <xs:pattern value="^h323:[a-zA-Z0-9!#$&amp;-;=?-\[\]_~%]+$"></xs:pattern>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="Impu">
-    <xs:restriction base="xs:string">
-      <xs:pattern value="^[a-zA-Z0-9!#$&amp;-;=?-\[\]_~%]+$"></xs:pattern>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="Impi">
-    <xs:restriction base="xs:string">
-      <xs:pattern value="^[a-zA-Z0-9!#$&amp;-;=?-\[\]_~%]+$"></xs:pattern>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="GtpTunnelId">
-    <xs:restriction base="xs:integer">
-      <xs:minInclusive value="0"></xs:minInclusive>
-      <xs:maxInclusive value="4294967296"></xs:maxInclusive>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="CallPartyRole">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="Originating"></xs:enumeration>
-      <xs:enumeration value="Terminating"></xs:enumeration>
-      <xs:enumeration value="Forwarded-To"></xs:enumeration>
-    </xs:restriction>
-  </xs:simpleType>
-  
-  <xs:simpleType name="NonLocalIdentifier">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="Local"></xs:enumeration>
-      <xs:enumeration value="NonLocal"></xs:enumeration>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:complexType name="TargetIdentifierExtension">
-    <xs:complexContent>
-      <xs:extension base="Extension"></xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name="MediationDetails">
-    <xs:sequence>
-      <xs:element name="LIID" type="etsi103280:LIID"></xs:element>
-      <xs:element name="deliveryType" type="MediationDeliveryType"></xs:element>
-      <xs:element name="StartTime" type="etsi103280:QualifiedMicrosecondDateTime" minOccurs="0"></xs:element>
-      <xs:element name="EndTime" type="etsi103280:QualifiedMicrosecondDateTime" minOccurs="0"></xs:element>
-      <xs:element name="listOfDIDs" type="ListOfDids" minOccurs="0"></xs:element>
-      <xs:element name="mediationDetailsExtensions" type="MediationDetailsExtensions" minOccurs="0"></xs:element>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:simpleType name="DeliveryType">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="X2Only"></xs:enumeration>
-      <xs:enumeration value="X3Only"></xs:enumeration>
-      <xs:enumeration value="X2andX3"></xs:enumeration>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="MediationDeliveryType">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="HI2Only"></xs:enumeration>
-      <xs:enumeration value="HI3Only"></xs:enumeration>
-      <xs:enumeration value="HI2andHI3"></xs:enumeration>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:complexType name="ListOfDids">
-    <xs:sequence>
-      <xs:element name="dId" type="DId" minOccurs="0" maxOccurs="unbounded"></xs:element>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="ListOfMediationDetails">
-    <xs:sequence>
-      <xs:element name="mediationDetails" type="MediationDetails" minOccurs="0" maxOccurs="unbounded"></xs:element>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="TaskDetailsExtensions">
-    <xs:complexContent>
-      <xs:extension base="Extension"></xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name="MediationDetailsExtensions">
-    <xs:complexContent>
-      <xs:extension base="Extension"></xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name="Extension">
-    <xs:sequence>
-      <xs:element name="Owner" type="xs:string"></xs:element>
-      <xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded"></xs:any>
-    </xs:sequence>
-  </xs:complexType>
-
-  <!-- see section 6.2.1 -->
-  <xs:complexType name="ActivateTaskResponse">
-    <xs:complexContent>
-      <xs:extension base="X1ResponseMessage">
-        <xs:sequence>
-          <xs:element name="oK" type="OK"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:simpleType name="OK">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="AcknowledgedAndCompleted"></xs:enumeration>
-      <xs:enumeration value="Acknowledged"></xs:enumeration>
-    </xs:restriction>
-  </xs:simpleType>
-  
-  <xs:simpleType name="OKAckAndComplete">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="AcknowledgedAndCompleted"></xs:enumeration>
-    </xs:restriction>
-  </xs:simpleType>
-
-  
-  
-  <!-- see section 6.2.2 -->
-  <xs:complexType name="ModifyTaskRequest">
-    <xs:complexContent>
-      <xs:extension base="X1RequestMessage">
-        <xs:sequence>
-          <xs:element name="taskDetails" type="TaskDetails"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <!-- see section 6.2.2 -->
-  <xs:complexType name="ModifyTaskResponse">
-    <xs:complexContent>
-      <xs:extension base="X1ResponseMessage">
-        <xs:sequence>
-          <xs:element name="oK" type="OK"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-
-  <!-- see section 6.2.3 -->
-  <xs:complexType name="DeactivateTaskRequest">
-    <xs:complexContent>
-      <xs:extension base="X1RequestMessage">
-        <xs:sequence>
-          <xs:element name="xId" type="XId"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <!-- see section 6.2.3 -->  
-  <xs:complexType name="DeactivateTaskResponse">
-    <xs:complexContent>
-      <xs:extension base="X1ResponseMessage">
-        <xs:sequence>
-          <xs:element name="oK" type="OK"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>  
-
-
-  <!-- see section 6.2.4 -->
-  <xs:complexType name="DeactivateAllTasksRequest">
-    <xs:complexContent>
-      <xs:extension base="X1RequestMessage">
-        <xs:sequence>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <!-- see section 6.2.4 -->
-  <xs:complexType name="DeactivateAllTasksResponse">
-    <xs:complexContent>
-      <xs:extension base="X1ResponseMessage">
-        <xs:sequence>
-          <xs:element name="oK" type="OK"></xs:element>          
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  
-  <!-- see section 6.3.1 -->
-  <xs:complexType name="CreateDestinationRequest">
-    <xs:complexContent>
-      <xs:extension base="X1RequestMessage">
-        <xs:sequence>
-          <xs:element name="destinationDetails" type="DestinationDetails"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <!-- see sextion 6.3.1.2 -->
-  <xs:complexType name="DestinationDetails">
-    <xs:sequence>
-      <xs:element name="dId" type="DId"></xs:element>
-      <xs:element name="friendlyName" type="xs:string" minOccurs="0"></xs:element>
-      <xs:element name="deliveryType" type="DeliveryType"></xs:element>
-      <xs:element name="deliveryAddress" type="DeliveryAddress"></xs:element>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="DeliveryAddress">
-    <xs:choice>
-      <xs:element name="ipAddressAndPort" type="etsi103280:IPAddressPort"></xs:element>
-      <xs:element name="e164Number" type="etsi103280:InternationalE164"></xs:element>
-      <xs:element name="uri" type="xs:anyURI"></xs:element>
-      <xs:element name="emailAddress" type="etsi103280:EmailAddress"></xs:element>
-    </xs:choice>
-  </xs:complexType>
-
-  <!-- see section 6.3.1 -->
-  <xs:complexType name="CreateDestinationResponse">
-    <xs:complexContent>
-      <xs:extension base="X1ResponseMessage">
-        <xs:sequence>
-          <xs:element name="oK" type="OK"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  
-  
-  <!-- see section 6.3.2 -->
-  <xs:complexType name="ModifyDestinationRequest">
-    <xs:complexContent>
-      <xs:extension base="X1RequestMessage">
-        <xs:sequence>
-          <xs:element name="destinationDetails" type="DestinationDetails"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <!-- see section 6.3.2 -->
-  <xs:complexType name="ModifyDestinationResponse">
-    <xs:complexContent>
-      <xs:extension base="X1ResponseMessage">
-        <xs:sequence>
-          <xs:element name="oK" type="OK"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-
-
-  <!-- see section 6.3.3 -->
-  <xs:complexType name="RemoveDestinationRequest">
-    <xs:complexContent>
-      <xs:extension base="X1RequestMessage">
-        <xs:sequence>
-          <xs:element name="dId" type="DId"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <!-- see section 6.3.3 -->
-  <xs:complexType name="RemoveDestinationResponse">
-    <xs:complexContent>
-      <xs:extension base="X1ResponseMessage">
-        <xs:sequence>
-          <xs:element name="oK" type="OK"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-
-  <!-- see section 6.3.4 -->
-  <xs:complexType name="RemoveAllDestinationsRequest">
-    <xs:complexContent>
-      <xs:extension base="X1RequestMessage">
-        <xs:sequence>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <!-- see section 6.3.4 -->
-  <xs:complexType name="RemoveAllDestinationsResponse">
-    <xs:complexContent>
-      <xs:extension base="X1ResponseMessage">
-        <xs:sequence>
-          <xs:element name="oK" type="OK"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-
-  <!-- see section 6.4.2 -->
-  <xs:complexType name="GetTaskDetailsRequest">
-    <xs:complexContent>
-      <xs:extension base="X1RequestMessage">
-        <xs:sequence>
-          <xs:element name="xId" type="XId"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <!-- see section 6.4.2 -->
-  <xs:complexType name="GetTaskDetailsResponse">
-    <xs:complexContent>
-      <xs:extension base="X1ResponseMessage">
-        <xs:sequence>
-          <xs:element name="taskResponseDetails" type="TaskResponseDetails"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name="TaskResponseDetails">
-    <xs:sequence>
-      <xs:element name="taskDetails" type="TaskDetails"></xs:element>
-      <xs:element name="taskStatus" type="TaskStatus"></xs:element>
-    </xs:sequence>
-  </xs:complexType>
-
-  <!-- see section 6.4.2.2 -->
-  <xs:complexType name="TaskStatus">
-    <xs:sequence>
-      <xs:element name="provisioningStatus" type="ProvisioningStatus"></xs:element>
-      <xs:element name="listOfFaults" type="ListOfFaults"></xs:element>
-      <xs:element name="timeOfLastIntercept" type="etsi103280:QualifiedMicrosecondDateTime" minOccurs="0"></xs:element>
-      <xs:element name="amountOfX2Data" type="xs:integer" minOccurs="0"></xs:element>
-      <xs:element name="amountOfX3Data" type="xs:integer" minOccurs="0"></xs:element>
-      <xs:element name="timeOfLastModification" type="etsi103280:QualifiedMicrosecondDateTime" minOccurs="0"></xs:element>
-      <xs:element name="numberOfModifications" type="xs:integer" minOccurs="0"></xs:element>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:simpleType name="ProvisioningStatus">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="awaitingProvisioning"></xs:enumeration>
-      <xs:enumeration value="failed"></xs:enumeration>
-      <xs:enumeration value="complete"></xs:enumeration>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:complexType name="ListOfFaults">
-    <xs:sequence>
-      <xs:element name="unresolvedFault" type="ErrorInformation" minOccurs="0" maxOccurs="unbounded"></xs:element>
-    </xs:sequence>
-  </xs:complexType>
-  
-  <!-- see section 6.4.3 -->
-  <xs:complexType name="GetDestinationDetailsRequest">
-    <xs:complexContent>
-      <xs:extension base="X1RequestMessage">
-        <xs:sequence>
-          <xs:element name="dId" type="DId"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <!-- see section 6.4.3 -->
-  <xs:complexType name="GetDestinationDetailsResponse">
-    <xs:complexContent>
-      <xs:extension base="X1ResponseMessage">
-        <xs:sequence>
-          <xs:element name="destinationResponseDetails" type="DestinationResponseDetails"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name="DestinationResponseDetails">
-    <xs:sequence>
-      <xs:element name="destinationDetails" type="DestinationDetails"></xs:element>
-      <xs:element name="destinationStatus" type="DestinationStatus"></xs:element>
-    </xs:sequence>
-  </xs:complexType>
-
-  <!-- see section 6.4.3.2 -->
-  <xs:complexType name="DestinationStatus">
-      <xs:sequence>
-        <xs:element name="destinationDeliveryStatus" type="DestinationDeliveryStatus"></xs:element>
-        <xs:element name="listOfFaults" type="ListOfFaults"></xs:element>
-      </xs:sequence>
-  </xs:complexType>
-
-  <xs:simpleType name="DestinationDeliveryStatus">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="activeAndWorking"></xs:enumeration>
-      <xs:enumeration value="deliveryFault"></xs:enumeration>
-    </xs:restriction>
-  </xs:simpleType>    
-
-  <!-- see section 6.4.4 -->
-  <xs:complexType name="GetNEStatusRequest">
-    <xs:complexContent>
-      <xs:extension base="X1RequestMessage">
-        <xs:sequence>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <!-- see section 6.4.4 -->
-  <xs:complexType name="GetNEStatusResponse">
-    <xs:complexContent>
-      <xs:extension base="X1ResponseMessage">
-        <xs:sequence>
-          <xs:element name="neStatusDetails" type="NeStatusDetails"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name="NeStatusDetails">
-    <xs:sequence>
-      <xs:element name="neStatus" type="NeStatus"></xs:element>
-      <xs:element name="listOfFaults" type="ListOfFaults"></xs:element>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:simpleType name="NeStatus">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="OK"></xs:enumeration>
-      <xs:enumeration value="Faults"></xs:enumeration>
-    </xs:restriction>
-  </xs:simpleType>  
-    
-    
-  <!-- see section 6.4.5 -->
-  <xs:complexType name="GetAllDetailsRequest">
-    <xs:complexContent>
-      <xs:extension base="X1RequestMessage">
-        <xs:sequence>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <!-- see section 6.4.5 -->
-  <xs:complexType name="GetAllDetailsResponse">
-    <xs:complexContent>
-      <xs:extension base="X1ResponseMessage">
-        <xs:sequence>
-          <xs:element name="neStatusDetails" type="NeStatusDetails"></xs:element>
-          <xs:element name="listOfTaskResponseDetails" type="ListOfTaskResponseDetails"></xs:element>
-          <xs:element name="listOfDestinationResponseDetails" type="ListOfDestinationResponseDetails"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name="ListOfTaskResponseDetails">
-    <xs:sequence>
-      <xs:element name="taskResponseDetails" type="TaskResponseDetails" minOccurs="0" maxOccurs="unbounded"></xs:element>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="ListOfDestinationResponseDetails">
-    <xs:sequence>
-      <xs:element name="destinationResponseDetails" type="DestinationResponseDetails" minOccurs="0" maxOccurs="unbounded"></xs:element>
-    </xs:sequence>
-  </xs:complexType>
-
-
-  <!-- see section 6.4.6 -->
-  <xs:complexType name="ListAllDetailsRequest">
-    <xs:complexContent>
-      <xs:extension base="X1RequestMessage">
-        <xs:sequence>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <!-- see section 6.4.6 -->
-  <xs:complexType name="ListAllDetailsResponse">
-    <xs:complexContent>
-      <xs:extension base="X1ResponseMessage">
-        <xs:sequence>
-          <xs:element name="ListOfXIDs" type="ListOfXids"></xs:element>
-          <xs:element name="ListOfDIDs" type="ListOfDids"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name="ListOfXids">
-    <xs:sequence>
-      <xs:element name="xId" type="XId" minOccurs="0" maxOccurs="unbounded"></xs:element>
-    </xs:sequence>
-  </xs:complexType>  
-
-
-  <!-- see section  6.5.2 -->
-  <xs:complexType name="ReportTaskIssueRequest">
-    <xs:complexContent>
-      <xs:extension base="X1RequestMessage">
-        <xs:sequence>
-          <xs:element name="xId" type="XId"></xs:element>
-          <xs:element name="taskReportType" type="TaskReportType"></xs:element>
-          <xs:element name="taskIssueErrorCode" type="xs:integer" minOccurs="0"></xs:element>
-          <xs:element name="taskIssueDetails" type="xs:string" minOccurs="0"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <!-- see section 6.4.2.2 -->
-  <xs:simpleType name="TaskReportType">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="AllClear"></xs:enumeration>
-      <xs:enumeration value="Warning"></xs:enumeration>
-      <xs:enumeration value="NonTerminatingFault"></xs:enumeration>
-      <xs:enumeration value="TerminatingFault"></xs:enumeration>
-      <xs:enumeration value="ImplicitDeactivation"></xs:enumeration>
-      <xs:enumeration value="FullyActionedAndSuccesful"></xs:enumeration>
-      <xs:enumeration value="FullyActionedAndUnsuccesful"></xs:enumeration>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <!-- see section  6.5.2 -->
-  <xs:complexType name="ReportTaskIssueResponse">
-    <xs:complexContent>
-      <xs:extension base="X1ResponseMessage">
-        <xs:sequence>
-          <xs:element name="oK" type="OK"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  
-  
-  <!-- see section  6.5.3 -->
-  <xs:complexType name="ReportDestinationIssueRequest">
-    <xs:complexContent>
-      <xs:extension base="X1RequestMessage">
-        <xs:sequence>
-          <xs:element name="dId" type="DId"></xs:element>
-          <xs:element name="destinationReportType" type="TaskReportType"></xs:element>
-          <xs:element name="destinationIssueErrorCode" type="xs:integer" minOccurs="0"></xs:element>
-          <xs:element name="destinationIssueDetails" type="xs:string" minOccurs="0"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <!-- see section  6.5.3 -->
-  <xs:complexType name="ReportDestinationIssueResponse">
-    <xs:complexContent>
-      <xs:extension base="X1ResponseMessage">
-        <xs:sequence>
-          <xs:element name="oK" type="OK"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  
-  
-  <!-- see section 6.5.4 -->
-  <xs:complexType name="ReportNEIssueRequest">
-    <xs:complexContent>
-      <xs:extension base="X1RequestMessage">
-        <xs:sequence>
-          <xs:element name="typeOfNeIssueMessage" type="TypeOfNeIssueMessage"></xs:element>
-          <xs:element name="description" type="xs:string"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <!-- see section 6.5.4 -->
-  <xs:simpleType name="TypeOfNeIssueMessage">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="Warning"></xs:enumeration>
-      <xs:enumeration value="FaultCleared"></xs:enumeration>
-      <xs:enumeration value="FaultReport"></xs:enumeration>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <!-- see section 6.5.4 -->
-  <xs:complexType name="ReportNEIssueResponse">
-    <xs:complexContent>
-      <xs:extension base="X1ResponseMessage">
-        <xs:sequence>
-          <xs:element name="oK" type="OKAckAndComplete"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-
-  <!-- see section 6.6.1 -->
-  <xs:complexType name="PingRequest">
-    <xs:complexContent>
-      <xs:extension base="X1RequestMessage">
-        <xs:sequence>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <!-- see section 6.6.1 -->
-  <xs:complexType name="PingResponse">
-    <xs:complexContent>
-      <xs:extension base="X1ResponseMessage">
-        <xs:sequence>
-          <xs:element name="oK" type="OK"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-
-  <!-- see section 6.6.2 -->
-  <xs:complexType name="KeepaliveRequest">
-    <xs:complexContent>
-      <xs:extension base="X1RequestMessage">
-        <xs:sequence>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <!-- see section 6.6.2 -->
-  <xs:complexType name="KeepaliveResponse">
-    <xs:complexContent>
-      <xs:extension base="X1ResponseMessage">
-        <xs:sequence>
-          <xs:element name="oK" type="OK"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-
-
+<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:import namespace="http://uri.etsi.org/03280/common/2017/07"/>
+	<!-- Message containers -->
+	<xs:element name="X1Request" type="RequestContainer"/>
+	<xs:element name="X1Response" type="ResponseContainer"/>
+	<xs:element name="X1TopLevelErrorResponse" type="TopLevelErrorResponse"/>
+	<xs:complexType name="RequestContainer">
+		<xs:sequence>
+			<xs:element name="x1RequestMessage" type="X1RequestMessage" minOccurs="1" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="ResponseContainer">
+		<xs:sequence>
+			<xs:element name="x1ResponseMessage" type="X1ResponseMessage" minOccurs="1" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!-- Top-level Message definitions -->
+	<!-- See section 6.1 -->
+	<xs:complexType name="X1RequestMessage">
+		<xs:sequence>
+			<xs:element name="admfIdentifier" type="AdmfIdentifier"/>
+			<xs:element name="neIdentifier" type="NeIdentifier"/>
+			<xs:element name="messageTimestamp" type="etsi103280:QualifiedMicrosecondDateTime"/>
+			<xs:element name="version" type="Version"/>
+			<xs:element name="x1TransactionId" type="X1TransactionId"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!-- See section 6.1 -->
+	<xs:complexType name="X1ResponseMessage">
+		<xs:sequence>
+			<xs:element name="admfIdentifier" type="AdmfIdentifier"/>
+			<xs:element name="neIdentifier" type="NeIdentifier"/>
+			<xs:element name="messageTimestamp" type="etsi103280:QualifiedMicrosecondDateTime"/>
+			<xs:element name="version" type="Version"/>
+			<xs:element name="x1TransactionId" type="X1TransactionId"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!-- See section 5.1 -->
+	<xs:simpleType name="XId">
+		<xs:restriction base="etsi103280:UUID"/>
+	</xs:simpleType>
+	<xs:simpleType name="DId">
+		<xs:restriction base="etsi103280:UUID"/>
+	</xs:simpleType>
+	<!-- See section 5.2 -->
+	<xs:simpleType name="X1TransactionId">
+		<xs:restriction base="etsi103280:UUID"/>
+	</xs:simpleType>
+	<!-- See section 6.1 -->
+	<xs:simpleType name="AdmfIdentifier">
+		<xs:restriction base="xs:token"/>
+	</xs:simpleType>
+	<!-- See section 6.1 -->
+	<xs:simpleType name="NeIdentifier">
+		<xs:restriction base="xs:token"/>
+	</xs:simpleType>
+	<!-- See section 6.1 -->
+	<xs:simpleType name="Version">
+		<xs:restriction base="xs:string">
+			<xs:pattern value="v1.5.1"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!-- Error Reponse -->
+	<xs:complexType name="TopLevelErrorResponse">
+		<xs:sequence>
+			<xs:element name="admfIdentifier" type="AdmfIdentifier"/>
+			<xs:element name="neIdentifier" type="NeIdentifier"/>
+			<xs:element name="messageTimestamp" type="etsi103280:QualifiedMicrosecondDateTime"/>
+			<xs:element name="version" type="Version"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!-- See section 6.7 -->
+	<xs:complexType name="ErrorResponse">
+		<xs:complexContent>
+			<xs:extension base="X1ResponseMessage">
+				<xs:sequence>
+					<xs:element name="requestMessageType" type="RequestMessageType"/>
+					<xs:element name="errorInformation" type="ErrorInformation"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:simpleType name="RequestMessageType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="ActivateTask"/>
+			<xs:enumeration value="ModifyTask"/>
+			<xs:enumeration value="DeactivateTask"/>
+			<xs:enumeration value="DeactivateAllTasks"/>
+			<xs:enumeration value="GetTaskDetails"/>
+			<xs:enumeration value="CreateDestination"/>
+			<xs:enumeration value="ModifyDestination"/>
+			<xs:enumeration value="RemoveDestination"/>
+			<xs:enumeration value="RemoveAllDestinations"/>
+			<xs:enumeration value="GetDestinationDetails"/>
+			<xs:enumeration value="GetNEStatus"/>
+			<xs:enumeration value="GetAllDetails"/>
+			<xs:enumeration value="ListAllDetails"/>
+			<xs:enumeration value="ReportTaskIssue"/>
+			<xs:enumeration value="ReportDestinationIssue"/>
+			<xs:enumeration value="ReportNEIssue"/>
+			<xs:enumeration value="Ping"/>
+			<xs:enumeration value="Keepalive"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:complexType name="ErrorInformation">
+		<xs:sequence>
+			<xs:element name="errorCode" type="xs:integer"/>
+			<xs:element name="errorDescription" type="xs:string"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!-- Individual Message Definitions -->
+	<!-- See section 6.2.1 -->
+	<xs:complexType name="ActivateTaskRequest">
+		<xs:complexContent>
+			<xs:extension base="X1RequestMessage">
+				<xs:sequence>
+					<xs:element name="taskDetails" type="TaskDetails"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!-- See section 6.2.1.2 -->
+	<xs:complexType name="TaskDetails">
+		<xs:sequence>
+			<xs:element name="xId" type="XId"/>
+			<xs:element name="targetIdentifiers" type="ListOfTargetIdentifiers"/>
+			<xs:element name="deliveryType" type="DeliveryType"/>
+			<xs:element name="listOfDIDs" type="ListOfDids"/>
+			<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="taskDetailsExtensions" type="TaskDetailsExtensions" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="ListOfTargetIdentifiers">
+		<xs:sequence>
+			<xs:element name="targetIdentifier" type="TargetIdentifier" minOccurs="1" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="TargetIdentifier">
+		<xs:choice>
+			<xs:element name="e164Number" type="etsi103280:InternationalE164"/>
+			<xs:element name="imsi" type="etsi103280:IMSI"/>
+			<xs:element name="imei" type="etsi103280:IMEI"/>
+			<xs:element name="macAddress" type="etsi103280:MACAddress"/>
+			<xs:element name="ipv4Address" type="etsi103280:IPv4Address"/>
+			<xs:element name="ipv6Address" type="etsi103280:IPv6Address"/>
+			<xs:element name="ipv4Cidr" type="etsi103280:IPCIDR"/>
+			<xs:element name="ipv6Cidr" type="etsi103280:IPv6CIDR"/>
+			<xs:element name="tcpPort" type="etsi103280:TCPPort"/>
+			<xs:element name="tcpPortRange" type="etsi103280:TCPPortRange"/>
+			<xs:element name="udpPort" type="etsi103280:UDPPort"/>
+			<xs:element name="udpPortRange" type="etsi103280:UDPPortRange"/>
+			<xs:element name="emailAddress" type="etsi103280:EmailAddress"/>
+			<xs:element name="sipUri" type="etsi103280:SIPURI"/>
+			<xs:element name="telUri" type="etsi103280:TELURI"/>
+			<xs:element name="h323Uri" type="H323Uri"/>
+			<xs:element name="impu" type="Impu"/>
+			<xs:element name="impi" type="Impi"/>
+			<xs:element name="nai" type="etsi103280:NAI"/>
+			<xs:element name="radiusAttribute" type="xs:hexBinary"/>
+			<xs:element name="gtpuTunnelId" type="GtpTunnelId"/>
+			<xs:element name="gtpcTunnelId" type="GtpTunnelId"/>
+			<xs:element name="callPartyRole" type="CallPartyRole"/>
+			<xs:element name="nonLocalIdentifier" type="NonLocalIdentifier"/>
+			<xs:element name="supiimsi" type="etsi103280:SUPIIMSI"/>
+			<xs:element name="supinai" type="etsi103280:SUPINAI"/>
+			<xs:element name="suci" type="etsi103280:SUCI"/>
+			<xs:element name="peiImei" type="etsi103280:PEIIMEI"/>
+			<xs:element name="peiImeiCheckDigit" type="etsi103280:PEIIMEICheckDigit"/>
+			<xs:element name="peiImeisv" type="etsi103280:PEIIMEISV"/>
+			<xs:element name="gpsiMsisdn" type="etsi103280:GPSIMSISDN"/>
+			<xs:element name="gpsiNai" type="etsi103280:GPSINAI"/>
+			<xs:element name="targetIdentifierExtension" type="TargetIdentifierExtension"/>
+		</xs:choice>
+	</xs:complexType>
+	<xs:simpleType name="H323Uri">
+		<xs:restriction base="xs:string">
+			<xs:pattern value="^h323:[a-zA-Z0-9!#$&amp;-;=?-\[\]_~%]+$"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="Impu">
+		<xs:restriction base="xs:string">
+			<xs:pattern value="^[a-zA-Z0-9!#$&amp;-;=?-\[\]_~%]+$"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="Impi">
+		<xs:restriction base="xs:string">
+			<xs:pattern value="^[a-zA-Z0-9!#$&amp;-;=?-\[\]_~%]+$"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="GtpTunnelId">
+		<xs:restriction base="xs:integer">
+			<xs:minInclusive value="0"/>
+			<xs:maxInclusive value="4294967296"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="CallPartyRole">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Originating"/>
+			<xs:enumeration value="Terminating"/>
+			<xs:enumeration value="Forwarded-To"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="NonLocalIdentifier">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Local"/>
+			<xs:enumeration value="NonLocal"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:complexType name="TargetIdentifierExtension">
+		<xs:complexContent>
+			<xs:extension base="Extension"/>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="MediationDetails">
+		<xs:sequence>
+			<xs:element name="LIID" type="etsi103280:LIID"/>
+			<xs:element name="deliveryType" type="MediationDeliveryType"/>
+			<xs:element name="StartTime" type="etsi103280:QualifiedMicrosecondDateTime" minOccurs="0"/>
+			<xs:element name="EndTime" type="etsi103280:QualifiedMicrosecondDateTime" minOccurs="0"/>
+			<xs:element name="listOfDIDs" type="ListOfDids" minOccurs="0"/>
+			<xs:element name="mediationDetailsExtensions" type="MediationDetailsExtensions" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="serviceScopingOptions" type="ListOfServiceScopingOptions" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="ListOfServiceScopingOptions">
+		<xs:sequence>
+			<xs:element name="serviceScopingOptions" type="ServiceScopingOptions" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name=" ServiceScopingOptions">
+		<xs:sequence>
+			<xs:element name="serviceType" type="ListOfServiceTypes" minOccurs="0"/>
+			<xs:element name="locationType" type="LocationTypeOptions" minOccurs="0"/>
+			<xs:element name="suspendOnOutboundInternationalRoaming" type="xs:boolean" minOccurs="0"/>
+			<xs:element name="reportPostDialledDigits" type="xs:boolean" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="ListOfServiceTypes">
+		<xs:sequence>
+			<xs:element name="serviceType" type="ServiceType" minOccurs="1" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:simpleType name="ServiceType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="voice"/>
+			<xs:enumeration value="data"/>
+			<xs:enumeration value="messaging"/>
+			<xs:enumeration value="pushToTalk"/>
+			<xs:enumeration value="LALS"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:complexType name="LocationTypeOptions">
+		<xs:choice>
+			<xs:element name="doNotReport" type="xs:string" fixed=""/>
+			<xs:element name="listOfLocationTypes" type="ListOfLocationTypes"/>
+		</xs:choice>
+	</xs:complexType>
+	 <xs:complexType name=" ListOfLocationTypes ">
+		<xs:sequence>
+			<xs:element name="locationType" type="LocationType" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="LocationType">
+		<xs:sequence>
+			<xs:element name="beginningAndEnd" type="xs:boolean" minOccurs="0"/>
+			<xs:element name="uponChange" type="xs:boolean" minOccurs="0"/>
+			<xs:element name="LALS" type="xs:boolean" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:simpleType name="DeliveryType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="X2Only"/>
+			<xs:enumeration value="X3Only"/>
+			<xs:enumeration value="X2andX3"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="MediationDeliveryType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="HI2Only"/>
+			<xs:enumeration value="HI3Only"/>
+			<xs:enumeration value="HI2andHI3"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:complexType name="ListOfDids">
+		<xs:sequence>
+			<xs:element name="dId" type="DId" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="ListOfMediationDetails">
+		<xs:sequence>
+			<xs:element name="mediationDetails" type="MediationDetails" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="TaskDetailsExtensions">
+		<xs:complexContent>
+			<xs:extension base="Extension"/>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="MediationDetailsExtensions">
+		<xs:complexContent>
+			<xs:extension base="Extension"/>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="Extension">
+		<xs:sequence>
+			<xs:element name="Owner" type="xs:string"/>
+			<xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!-- See section 6.2.1 -->
+	<xs:complexType name="ActivateTaskResponse">
+		<xs:complexContent>
+			<xs:extension base="X1ResponseMessage">
+				<xs:sequence>
+					<xs:element name="oK" type="OK"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:simpleType name="OK">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="AcknowledgedAndCompleted"/>
+			<xs:enumeration value="Acknowledged"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="OKAckAndComplete">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="AcknowledgedAndCompleted"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!-- See section 6.2.2 -->
+	<xs:complexType name="ModifyTaskRequest">
+		<xs:complexContent>
+			<xs:extension base="X1RequestMessage">
+				<xs:sequence>
+					<xs:element name="taskDetails" type="TaskDetails"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!-- See section 6.2.2 -->
+	<xs:complexType name="ModifyTaskResponse">
+		<xs:complexContent>
+			<xs:extension base="X1ResponseMessage">
+				<xs:sequence>
+					<xs:element name="oK" type="OK"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!-- See section 6.2.3 -->
+	<xs:complexType name="DeactivateTaskRequest">
+		<xs:complexContent>
+			<xs:extension base="X1RequestMessage">
+				<xs:sequence>
+					<xs:element name="xId" type="XId"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!-- See section 6.2.3 -->
+	<xs:complexType name="DeactivateTaskResponse">
+		<xs:complexContent>
+			<xs:extension base="X1ResponseMessage">
+				<xs:sequence>
+					<xs:element name="oK" type="OK"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!-- See section 6.2.4 -->
+	<xs:complexType name="DeactivateAllTasksRequest">
+		<xs:complexContent>
+			<xs:extension base="X1RequestMessage">
+				<xs:sequence/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!-- See section 6.2.4 -->
+	<xs:complexType name="DeactivateAllTasksResponse">
+		<xs:complexContent>
+			<xs:extension base="X1ResponseMessage">
+				<xs:sequence>
+					<xs:element name="oK" type="OK"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!-- See section 6.3.1 -->
+	<xs:complexType name="CreateDestinationRequest">
+		<xs:complexContent>
+			<xs:extension base="X1RequestMessage">
+				<xs:sequence>
+					<xs:element name="destinationDetails" type="DestinationDetails"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!-- See section 6.3.1.2 -->
+	<xs:complexType name="DestinationDetails">
+		<xs:sequence>
+			<xs:element name="dId" type="DId"/>
+			<xs:element name="friendlyName" type="xs:string" minOccurs="0"/>
+			<xs:element name="deliveryType" type="DeliveryType"/>
+			<xs:element name="deliveryAddress" type="DeliveryAddress"/>
+			<xs:element name="destinationDetailsExtensions" type="DestinationDetailsExtensions" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="DeliveryAddress">
+		<xs:choice>
+			<xs:element name="ipAddressAndPort" type="etsi103280:IPAddressPort"/>
+			<xs:element name="e164Number" type="etsi103280:InternationalE164"/>
+			<xs:element name="uri" type="xs:anyURI"/>
+			<xs:element name="emailAddress" type="etsi103280:EmailAddress"/>
+		</xs:choice>
+	</xs:complexType>
+	<xs:complexType name="DestinationDetailsExtensions">
+		<xs:complexContent>
+			<xs:extension base="Extension"/>
+		</xs:complexContent>
+	</xs:complexType>	
+	<!-- See section 6.3.1 -->
+	<xs:complexType name="CreateDestinationResponse">
+		<xs:complexContent>
+			<xs:extension base="X1ResponseMessage">
+				<xs:sequence>
+					<xs:element name="oK" type="OK"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!-- See section 6.3.2 -->
+	<xs:complexType name="ModifyDestinationRequest">
+		<xs:complexContent>
+			<xs:extension base="X1RequestMessage">
+				<xs:sequence>
+					<xs:element name="destinationDetails" type="DestinationDetails"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!-- See section 6.3.2 -->
+	<xs:complexType name="ModifyDestinationResponse">
+		<xs:complexContent>
+			<xs:extension base="X1ResponseMessage">
+				<xs:sequence>
+					<xs:element name="oK" type="OK"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!-- See section 6.3.3 -->
+	<xs:complexType name="RemoveDestinationRequest">
+		<xs:complexContent>
+			<xs:extension base="X1RequestMessage">
+				<xs:sequence>
+					<xs:element name="dId" type="DId"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!-- See section 6.3.3 -->
+	<xs:complexType name="RemoveDestinationResponse">
+		<xs:complexContent>
+			<xs:extension base="X1ResponseMessage">
+				<xs:sequence>
+					<xs:element name="oK" type="OK"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!-- See section 6.3.4 -->
+	<xs:complexType name="RemoveAllDestinationsRequest">
+		<xs:complexContent>
+			<xs:extension base="X1RequestMessage">
+				<xs:sequence/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!-- See section 6.3.4 -->
+	<xs:complexType name="RemoveAllDestinationsResponse">
+		<xs:complexContent>
+			<xs:extension base="X1ResponseMessage">
+				<xs:sequence>
+					<xs:element name="oK" type="OK"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!-- See section 6.4.2 -->
+	<xs:complexType name="GetTaskDetailsRequest">
+		<xs:complexContent>
+			<xs:extension base="X1RequestMessage">
+				<xs:sequence>
+					<xs:element name="xId" type="XId"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!-- See section 6.4.2 -->
+	<xs:complexType name="GetTaskDetailsResponse">
+		<xs:complexContent>
+			<xs:extension base="X1ResponseMessage">
+				<xs:sequence>
+					<xs:element name="taskResponseDetails" type="TaskResponseDetails"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="TaskResponseDetails">
+		<xs:sequence>
+			<xs:element name="taskDetails" type="TaskDetails"/>
+			<xs:element name="taskStatus" type="TaskStatus"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!-- See section 6.4.2.2 -->
+	<xs:complexType name="TaskStatus">
+		<xs:sequence>
+			<xs:element name="provisioningStatus" type="ProvisioningStatus"/>
+			<xs:element name="listOfFaults" type="ListOfFaults"/>
+			<xs:element name="timeOfLastIntercept" type="etsi103280:QualifiedMicrosecondDateTime" minOccurs="0"/>
+			<xs:element name="amountOfX2Data" type="xs:integer" minOccurs="0"/>
+			<xs:element name="amountOfX3Data" type="xs:integer" minOccurs="0"/>
+			<xs:element name="timeOfLastModification" type="etsi103280:QualifiedMicrosecondDateTime" minOccurs="0"/>
+			<xs:element name="numberOfModifications" type="xs:integer" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:simpleType name="ProvisioningStatus">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="awaitingProvisioning"/>
+			<xs:enumeration value="failed"/>
+			<xs:enumeration value="complete"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:complexType name="ListOfFaults">
+		<xs:sequence>
+			<xs:element name="unresolvedFault" type="ErrorInformation" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!-- See section 6.4.3 -->
+	<xs:complexType name="GetDestinationDetailsRequest">
+		<xs:complexContent>
+			<xs:extension base="X1RequestMessage">
+				<xs:sequence>
+					<xs:element name="dId" type="DId"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!-- See section 6.4.3 -->
+	<xs:complexType name="GetDestinationDetailsResponse">
+		<xs:complexContent>
+			<xs:extension base="X1ResponseMessage">
+				<xs:sequence>
+					<xs:element name="destinationResponseDetails" type="DestinationResponseDetails"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="DestinationResponseDetails">
+		<xs:sequence>
+			<xs:element name="destinationDetails" type="DestinationDetails"/>
+			<xs:element name="destinationStatus" type="DestinationStatus"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!-- See section 6.4.3.2 -->
+	<xs:complexType name="DestinationStatus">
+		<xs:sequence>
+			<xs:element name="destinationDeliveryStatus" type="DestinationDeliveryStatus"/>
+			<xs:element name="listOfFaults" type="ListOfFaults"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:simpleType name="DestinationDeliveryStatus">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="activeAndWorking"/>
+			<xs:enumeration value="deliveryFault"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!-- See section 6.4.4 -->
+	<xs:complexType name="GetNEStatusRequest">
+		<xs:complexContent>
+			<xs:extension base="X1RequestMessage">
+				<xs:sequence/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!-- See section 6.4.4 -->
+	<xs:complexType name="GetNEStatusResponse">
+		<xs:complexContent>
+			<xs:extension base="X1ResponseMessage">
+				<xs:sequence>
+					<xs:element name="neStatusDetails" type="NeStatusDetails"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="NeStatusDetails">
+		<xs:sequence>
+			<xs:element name="neStatus" type="NeStatus"/>
+			<xs:element name="listOfFaults" type="ListOfFaults"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:simpleType name="NeStatus">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="OK"/>
+			<xs:enumeration value="Faults"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!-- See section 6.4.5 -->
+	<xs:complexType name="GetAllDetailsRequest">
+		<xs:complexContent>
+			<xs:extension base="X1RequestMessage">
+				<xs:sequence/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!-- See section 6.4.5 -->
+	<xs:complexType name="GetAllDetailsResponse">
+		<xs:complexContent>
+			<xs:extension base="X1ResponseMessage">
+				<xs:sequence>
+					<xs:element name="neStatusDetails" type="NeStatusDetails"/>
+					<xs:element name="listOfTaskResponseDetails" type="ListOfTaskResponseDetails"/>
+					<xs:element name="listOfDestinationResponseDetails" type="ListOfDestinationResponseDetails"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="ListOfTaskResponseDetails">
+		<xs:sequence>
+			<xs:element name="taskResponseDetails" type="TaskResponseDetails" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="ListOfDestinationResponseDetails">
+		<xs:sequence>
+			<xs:element name="destinationResponseDetails" type="DestinationResponseDetails" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!-- See section 6.4.6 -->
+	<xs:complexType name="ListAllDetailsRequest">
+		<xs:complexContent>
+			<xs:extension base="X1RequestMessage">
+				<xs:sequence/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!-- See section 6.4.6 -->
+	<xs:complexType name="ListAllDetailsResponse">
+		<xs:complexContent>
+			<xs:extension base="X1ResponseMessage">
+				<xs:sequence>
+					<xs:element name="ListOfXIDs" type="ListOfXids"/>
+					<xs:element name="ListOfDIDs" type="ListOfDids"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="ListOfXids">
+		<xs:sequence>
+			<xs:element name="xId" type="XId" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!-- See section 6.5.2 -->
+	<xs:complexType name="ReportTaskIssueRequest">
+		<xs:complexContent>
+			<xs:extension base="X1RequestMessage">
+				<xs:sequence>
+					<xs:element name="xId" type="XId"/>
+					<xs:element name="taskReportType" type="TaskReportType"/>
+					<xs:element name="taskIssueErrorCode" type="xs:integer" minOccurs="0"/>
+					<xs:element name="taskIssueDetails" type="xs:string" minOccurs="0"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!-- See section 6.4.2.2 -->
+	<xs:simpleType name="TaskReportType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="AllClear"/>
+			<xs:enumeration value="Warning"/>
+			<xs:enumeration value="NonTerminatingFault"/>
+			<xs:enumeration value="TerminatingFault"/>
+			<xs:enumeration value="ImplicitDeactivation"/>
+			<xs:enumeration value="FullyActionedAndSuccessful"/>
+			<xs:enumeration value="FullyActionedAndUnsuccessful"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!-- See section 6.5.2 -->
+	<xs:complexType name="ReportTaskIssueResponse">
+		<xs:complexContent>
+			<xs:extension base="X1ResponseMessage">
+				<xs:sequence>
+					<xs:element name="oK" type="OK"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!-- See section 6.5.3 -->
+	<xs:complexType name="ReportDestinationIssueRequest">
+		<xs:complexContent>
+			<xs:extension base="X1RequestMessage">
+				<xs:sequence>
+					<xs:element name="dId" type="DId"/>
+					<xs:element name="destinationReportType" type="TaskReportType"/>
+					<xs:element name="destinationIssueErrorCode" type="xs:integer" minOccurs="0"/>
+					<xs:element name="destinationIssueDetails" type="xs:string" minOccurs="0"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!-- See section 6.5.3 -->
+	<xs:complexType name="ReportDestinationIssueResponse">
+		<xs:complexContent>
+			<xs:extension base="X1ResponseMessage">
+				<xs:sequence>
+					<xs:element name="oK" type="OK"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!-- See section 6.5.4 -->
+	<xs:complexType name="ReportNEIssueRequest">
+		<xs:complexContent>
+			<xs:extension base="X1RequestMessage">
+				<xs:sequence>
+					<xs:element name="typeOfNeIssueMessage" type="TypeOfNeIssueMessage"/>
+					<xs:element name="description" type="xs:string"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!-- See section 6.5.4 -->
+	<xs:simpleType name="TypeOfNeIssueMessage">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Warning"/>
+			<xs:enumeration value="FaultCleared"/>
+			<xs:enumeration value="FaultReport"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!-- See section 6.5.4 -->
+	<xs:complexType name="ReportNEIssueResponse">
+		<xs:complexContent>
+			<xs:extension base="X1ResponseMessage">
+				<xs:sequence>
+					<xs:element name="oK" type="OKAckAndComplete"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!-- See section 6.6.1 -->
+	<xs:complexType name="PingRequest">
+		<xs:complexContent>
+			<xs:extension base="X1RequestMessage">
+				<xs:sequence/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!-- See section 6.6.1 -->
+	<xs:complexType name="PingResponse">
+		<xs:complexContent>
+			<xs:extension base="X1ResponseMessage">
+				<xs:sequence>
+					<xs:element name="oK" type="OK"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!-- See section 6.6.2 -->
+	<xs:complexType name="KeepaliveRequest">
+		<xs:complexContent>
+			<xs:extension base="X1RequestMessage">
+				<xs:sequence/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!-- See section 6.6.2 -->
+	<xs:complexType name="KeepaliveResponse">
+		<xs:complexContent>
+			<xs:extension base="X1ResponseMessage">
+				<xs:sequence>
+					<xs:element name="oK" type="OK"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
 </xs:schema>
diff --git a/103221-1/examples/ActivateTaskRequest_example.xml b/103221-1/examples/ActivateTaskRequest_example.xml
index 934993e..76f510b 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.1.1</ns1:version>
+    <ns1:version>v1.5.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 9d4aa09..9a04c2a 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.1.1</ns1:version>
+    <ns1:version>v1.5.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 6579d01..89b1a37 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.1.1</ns1:version>
+    <ns1:version>v1.5.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 0000489..8eae1de 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.1.1</ns1:version>
+    <ns1:version>v1.5.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 c9e759f..10797cf 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.1.1</ns1:version>
+    <ns1:version>v1.5.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 5a377d1..c34ec56 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.1.1</ns1:version>
+    <ns1:version>v1.5.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 99e585a..cdbb8ee 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.1.1</ns1:version>
+    <ns1:version>v1.5.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 93663ce..287296e 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.1.1</ns1:version>
+    <ns1:version>v1.5.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 cc183c3..bc1ffa7 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.1.1</ns1:version>
+    <ns1:version>v1.5.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 080274d..bbd6b9c 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.1.1</ns1:version>
+    <ns1:version>v1.5.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 556e7f0..29c15b6 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.1.1</ns1:version>
+    <ns1:version>v1.5.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 8dc6247..ba19ff3 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.1.1</ns1:version>
+    <ns1:version>v1.5.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 0185b1a..491c90e 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.1.1</ns1:version>
+    <ns1:version>v1.5.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 b80bd03..5115b76 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.1.1</ns1:version>
+    <ns1:version>v1.5.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 1bdbdc3..330e8db 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.1.1</ns1:version>
+    <ns1:version>v1.5.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 5ed4d81..923bbaa 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.1.1</ns1:version>
+    <ns1:version>v1.5.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 229a918..b3f70b3 100644
--- a/103221-1/examples/ListAllDetailsRequest_example.xml
+++ b/103221-1/examples/ListAllDetailsRequest_example.xml
@@ -3,8 +3,8 @@
   <ns1:x1RequestMessage xsi:type="ns1:ListAllDetailsRequest">
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
-    <ns1:messageTimestamp>2017-10-06T18:46:21.50833Z</ns1:messageTimestamp>
-    <ns1:version>v1.1.1</ns1:version>
+    <ns1:messageTimestamp>2017-10-06T18:46:21.508330Z</ns1:messageTimestamp>
+    <ns1:version>v1.5.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 a1173f8..d762e08 100644
--- a/103221-1/examples/ListAllDetailsResponse_example.xml
+++ b/103221-1/examples/ListAllDetailsResponse_example.xml
@@ -3,8 +3,8 @@
   <ns1:x1ResponseMessage xsi:type="ns1:ListAllDetailsResponse">
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
-    <ns1:messageTimestamp>2017-10-06T18:46:21.50833Z</ns1:messageTimestamp>
-    <ns1:version>v1.1.1</ns1:version>
+    <ns1:messageTimestamp>2017-10-06T18:46:21.508330Z</ns1:messageTimestamp>
+    <ns1:version>v1.5.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 1db578f..bb48bac 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.1.1</ns1:version>
+    <ns1:version>v1.5.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 105124b..adfa3b5 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.1.1</ns1:version>
+    <ns1:version>v1.5.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 6697d38..d9687b6 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.1.1</ns1:version>
+    <ns1:version>v1.5.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 fd927da..9e4dadb 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.1.1</ns1:version>
+    <ns1:version>v1.5.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 1a5c185..6b27365 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.1.1</ns1:version>
+    <ns1:version>v1.5.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 ab392cc..a057bc2 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.1.1</ns1:version>
+    <ns1:version>v1.5.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 66277d9..a5d3ce1 100644
--- a/103221-1/examples/RemoveDestinationRequest_example.xml
+++ b/103221-1/examples/RemoveDestinationRequest_example.xml
@@ -3,8 +3,8 @@
   <ns1:x1RequestMessage xsi:type="ns1:RemoveDestinationRequest">
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
-    <ns1:messageTimestamp>2017-10-06T18:46:21.47363Z</ns1:messageTimestamp>
-    <ns1:version>v1.1.1</ns1:version>
+    <ns1:messageTimestamp>2017-10-06T18:46:21.473630Z</ns1:messageTimestamp>
+    <ns1:version>v1.5.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 b42246b..ec910e3 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.1.1</ns1:version>
+    <ns1:version>v1.5.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 52ba369..0f33e2b 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.1.1</ns1:version>
+    <ns1:version>v1.5.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 f6f54a0..44f3381 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.1.1</ns1:version>
+    <ns1:version>v1.5.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 4f3a8a8..b06c969 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.1.1</ns1:version>
+    <ns1:version>v1.5.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 d234f89..ab2a6b8 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.1.1</ns1:version>
+    <ns1:version>v1.5.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 fe3fd82..ddbe803 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.1.1</ns1:version>
+    <ns1:version>v1.5.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 263a904..eac2979 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.1.1</ns1:version>
+    <ns1:version>v1.5.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
new file mode 100644
index 0000000..0faa18a
--- /dev/null
+++ b/103221-1/examples/validate_examples.py
@@ -0,0 +1,93 @@
+import glob
+import sys
+
+
+XS = 'http://www.w3.org/2001/XMLSchema'
+
+
+def validate_example(example, schema):
+
+    print('Validating example {}'.format(example))
+
+    xml = open(example)
+    doc = etree.parse(xml)
+    schema.assertValid(doc)
+
+    print('Validated example {}'.format(example))
+
+
+def validate_examples(schema):
+
+    examples = glob.glob('./examples/*.xml')
+
+    if not examples:
+        sys.exit('ERROR: No examples found in ./examples/ directory')
+
+    for example in examples:
+        validate_example(example, schema)
+
+
+def load_schema(xsd):
+
+    xsd_file = open(xsd)
+
+    xsd_doc = etree.parse(xsd_file)
+
+    # Set schemaLocation of TS 103 280 XSD
+
+    common_xsd = glob.glob('./TS_103_280_*.xsd')
+
+    if not common_xsd:
+        sys.exit('ERROR: Please copy a TS 103 280 XSD into this directory')
+
+    if len(common_xsd) > 1:
+        sys.exit('ERROR: Too many TS 103 280 XSDs in current directory')
+
+    imports = xsd_doc.xpath('//*/xs:import', namespaces={'xs': XS})
+
+    for xsd_import in imports:
+        xsd_import.attrib['schemaLocation'] = common_xsd[0]
+
+    # Load TS 103 221-1 XSD as a schema
+
+    return etree.XMLSchema(xsd_doc)
+
+
+def validate_xsd(xsd):
+
+    print('Validating XSD {}'.format(xsd))
+
+    schema = load_schema(xsd)
+
+    print('Validated XSD {}'.format(xsd))
+    print('')
+
+    validate_examples(schema)
+
+    print('')
+    print('Validated all examples for XSD {}'.format(xsd))
+    print('')
+
+
+def validate_xsds():
+
+    xsds = glob.glob('./TS_103_221_01_*.xsd')
+
+    if not xsds:
+        sys.exit('ERROR: No TS 103 221-1 XSDs found in current directory')
+
+    for xsd in xsds:
+        validate_xsd(xsd)
+
+
+if __name__ == '__main__':
+
+    if sys.version_info <= (3, 5):
+        sys.exit('ERROR: You need at least Python 3.5 to run this tool')
+
+    try:
+        from lxml import etree
+    except ImportError:
+        sys.exit('ERROR: You need to install the Python lxml library')
+
+    validate_xsds()
diff --git a/103221-1/portal/output/ActivateTaskRequest_example.xml b/103221-1/portal/ActivateTaskRequest_example.xml
similarity index 96%
rename from 103221-1/portal/output/ActivateTaskRequest_example.xml
rename to 103221-1/portal/ActivateTaskRequest_example.xml
index 934993e..76f510b 100644
--- a/103221-1/portal/output/ActivateTaskRequest_example.xml
+++ b/103221-1/portal/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.1.1</ns1:version>
+    <ns1:version>v1.5.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/output/ActivateTaskResponse_example.xml b/103221-1/portal/ActivateTaskResponse_example.xml
similarity index 93%
rename from 103221-1/portal/output/ActivateTaskResponse_example.xml
rename to 103221-1/portal/ActivateTaskResponse_example.xml
index 9d4aa09..9a04c2a 100644
--- a/103221-1/portal/output/ActivateTaskResponse_example.xml
+++ b/103221-1/portal/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.1.1</ns1:version>
+    <ns1:version>v1.5.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/output/CreateDestinationRequest_example.xml b/103221-1/portal/CreateDestinationRequest_example.xml
similarity index 96%
rename from 103221-1/portal/output/CreateDestinationRequest_example.xml
rename to 103221-1/portal/CreateDestinationRequest_example.xml
index 6579d01..89b1a37 100644
--- a/103221-1/portal/output/CreateDestinationRequest_example.xml
+++ b/103221-1/portal/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.1.1</ns1:version>
+    <ns1:version>v1.5.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/output/CreateDestinationResponse_example.xml b/103221-1/portal/CreateDestinationResponse_example.xml
similarity index 93%
rename from 103221-1/portal/output/CreateDestinationResponse_example.xml
rename to 103221-1/portal/CreateDestinationResponse_example.xml
index 0000489..8eae1de 100644
--- a/103221-1/portal/output/CreateDestinationResponse_example.xml
+++ b/103221-1/portal/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.1.1</ns1:version>
+    <ns1:version>v1.5.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/output/DeactivateTaskRequest_example.xml b/103221-1/portal/DeactivateTaskRequest_example.xml
similarity index 93%
rename from 103221-1/portal/output/DeactivateTaskRequest_example.xml
rename to 103221-1/portal/DeactivateTaskRequest_example.xml
index c9e759f..10797cf 100644
--- a/103221-1/portal/output/DeactivateTaskRequest_example.xml
+++ b/103221-1/portal/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.1.1</ns1:version>
+    <ns1:version>v1.5.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/output/DeactivateTaskResponse_example.xml b/103221-1/portal/DeactivateTaskResponse_example.xml
similarity index 93%
rename from 103221-1/portal/output/DeactivateTaskResponse_example.xml
rename to 103221-1/portal/DeactivateTaskResponse_example.xml
index 5a377d1..c34ec56 100644
--- a/103221-1/portal/output/DeactivateTaskResponse_example.xml
+++ b/103221-1/portal/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.1.1</ns1:version>
+    <ns1:version>v1.5.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/output/GetAllDetailsRequest_example.xml b/103221-1/portal/GetAllDetailsRequest_example.xml
similarity index 93%
rename from 103221-1/portal/output/GetAllDetailsRequest_example.xml
rename to 103221-1/portal/GetAllDetailsRequest_example.xml
index 99e585a..cdbb8ee 100644
--- a/103221-1/portal/output/GetAllDetailsRequest_example.xml
+++ b/103221-1/portal/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.1.1</ns1:version>
+    <ns1:version>v1.5.1</ns1:version>
     <ns1:x1TransactionId>bfd0c982-b7d6-4a8e-80a0-89dab964aafd</ns1:x1TransactionId>
   </ns1:x1RequestMessage>
 </ns1:X1Request>
diff --git a/103221-1/portal/output/GetAllDetailsResponse_example.xml b/103221-1/portal/GetAllDetailsResponse_example.xml
similarity index 98%
rename from 103221-1/portal/output/GetAllDetailsResponse_example.xml
rename to 103221-1/portal/GetAllDetailsResponse_example.xml
index 93663ce..287296e 100644
--- a/103221-1/portal/output/GetAllDetailsResponse_example.xml
+++ b/103221-1/portal/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.1.1</ns1:version>
+    <ns1:version>v1.5.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/output/GetDestinationDetailsRequest_example.xml b/103221-1/portal/GetDestinationDetailsRequest_example.xml
similarity index 93%
rename from 103221-1/portal/output/GetDestinationDetailsRequest_example.xml
rename to 103221-1/portal/GetDestinationDetailsRequest_example.xml
index cc183c3..bc1ffa7 100644
--- a/103221-1/portal/output/GetDestinationDetailsRequest_example.xml
+++ b/103221-1/portal/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.1.1</ns1:version>
+    <ns1:version>v1.5.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/output/GetDestinationDetailsResponse_example.xml b/103221-1/portal/GetDestinationDetailsResponse_example.xml
similarity index 97%
rename from 103221-1/portal/output/GetDestinationDetailsResponse_example.xml
rename to 103221-1/portal/GetDestinationDetailsResponse_example.xml
index 080274d..bbd6b9c 100644
--- a/103221-1/portal/output/GetDestinationDetailsResponse_example.xml
+++ b/103221-1/portal/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.1.1</ns1:version>
+    <ns1:version>v1.5.1</ns1:version>
     <ns1:x1TransactionId>7de5709c-8269-417f-a123-7087d3971f8c</ns1:x1TransactionId>
     <ns1:destinationResponseDetails>
       <ns1:destinationDetails>
diff --git a/103221-1/portal/output/GetNEStatusRequest_example.xml b/103221-1/portal/GetNEStatusRequest_example.xml
similarity index 92%
rename from 103221-1/portal/output/GetNEStatusRequest_example.xml
rename to 103221-1/portal/GetNEStatusRequest_example.xml
index 556e7f0..29c15b6 100644
--- a/103221-1/portal/output/GetNEStatusRequest_example.xml
+++ b/103221-1/portal/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.1.1</ns1:version>
+    <ns1:version>v1.5.1</ns1:version>
     <ns1:x1TransactionId>93d571cb-3793-4385-8b59-2c14097ed743</ns1:x1TransactionId>
   </ns1:x1RequestMessage>
 </ns1:X1Request>
diff --git a/103221-1/portal/output/GetNEStatusResponse_example.xml b/103221-1/portal/GetNEStatusResponse_example.xml
similarity index 94%
rename from 103221-1/portal/output/GetNEStatusResponse_example.xml
rename to 103221-1/portal/GetNEStatusResponse_example.xml
index 8dc6247..ba19ff3 100644
--- a/103221-1/portal/output/GetNEStatusResponse_example.xml
+++ b/103221-1/portal/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.1.1</ns1:version>
+    <ns1:version>v1.5.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/output/GetTaskDetailsRequest_example.xml b/103221-1/portal/GetTaskDetailsRequest_example.xml
similarity index 93%
rename from 103221-1/portal/output/GetTaskDetailsRequest_example.xml
rename to 103221-1/portal/GetTaskDetailsRequest_example.xml
index 0185b1a..491c90e 100644
--- a/103221-1/portal/output/GetTaskDetailsRequest_example.xml
+++ b/103221-1/portal/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.1.1</ns1:version>
+    <ns1:version>v1.5.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/output/GetTaskDetailsResponse_example.xml b/103221-1/portal/GetTaskDetailsResponse_example.xml
similarity index 96%
rename from 103221-1/portal/output/GetTaskDetailsResponse_example.xml
rename to 103221-1/portal/GetTaskDetailsResponse_example.xml
index b80bd03..5115b76 100644
--- a/103221-1/portal/output/GetTaskDetailsResponse_example.xml
+++ b/103221-1/portal/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.1.1</ns1:version>
+    <ns1:version>v1.5.1</ns1:version>
     <ns1:x1TransactionId>609dcabd-5ab1-4c95-9681-a24681f105ac</ns1:x1TransactionId>
     <ns1:taskResponseDetails>
       <ns1:taskDetails>
diff --git a/103221-1/portal/output/KeepaliveRequest_example.xml b/103221-1/portal/KeepaliveRequest_example.xml
similarity index 92%
rename from 103221-1/portal/output/KeepaliveRequest_example.xml
rename to 103221-1/portal/KeepaliveRequest_example.xml
index 1bdbdc3..330e8db 100644
--- a/103221-1/portal/output/KeepaliveRequest_example.xml
+++ b/103221-1/portal/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.1.1</ns1:version>
+    <ns1:version>v1.5.1</ns1:version>
     <ns1:x1TransactionId>6420aa0f-e5e6-4a32-9dff-15b836589257</ns1:x1TransactionId>
   </ns1:x1RequestMessage>
 </ns1:X1Request>
diff --git a/103221-1/portal/output/KeepaliveResponse_example.xml b/103221-1/portal/KeepaliveResponse_example.xml
similarity index 93%
rename from 103221-1/portal/output/KeepaliveResponse_example.xml
rename to 103221-1/portal/KeepaliveResponse_example.xml
index 5ed4d81..923bbaa 100644
--- a/103221-1/portal/output/KeepaliveResponse_example.xml
+++ b/103221-1/portal/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.1.1</ns1:version>
+    <ns1:version>v1.5.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/output/ListAllDetailsRequest_example.xml b/103221-1/portal/ListAllDetailsRequest_example.xml
similarity index 78%
rename from 103221-1/portal/output/ListAllDetailsRequest_example.xml
rename to 103221-1/portal/ListAllDetailsRequest_example.xml
index 229a918..b3f70b3 100644
--- a/103221-1/portal/output/ListAllDetailsRequest_example.xml
+++ b/103221-1/portal/ListAllDetailsRequest_example.xml
@@ -3,8 +3,8 @@
   <ns1:x1RequestMessage xsi:type="ns1:ListAllDetailsRequest">
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
-    <ns1:messageTimestamp>2017-10-06T18:46:21.50833Z</ns1:messageTimestamp>
-    <ns1:version>v1.1.1</ns1:version>
+    <ns1:messageTimestamp>2017-10-06T18:46:21.508330Z</ns1:messageTimestamp>
+    <ns1:version>v1.5.1</ns1:version>
     <ns1:x1TransactionId>09529160-2e44-49c6-bf54-204ca5edcfab</ns1:x1TransactionId>
   </ns1:x1RequestMessage>
 </ns1:X1Request>
diff --git a/103221-1/portal/output/ListAllDetailsResponse_example.xml b/103221-1/portal/ListAllDetailsResponse_example.xml
similarity index 84%
rename from 103221-1/portal/output/ListAllDetailsResponse_example.xml
rename to 103221-1/portal/ListAllDetailsResponse_example.xml
index a1173f8..d762e08 100644
--- a/103221-1/portal/output/ListAllDetailsResponse_example.xml
+++ b/103221-1/portal/ListAllDetailsResponse_example.xml
@@ -3,8 +3,8 @@
   <ns1:x1ResponseMessage xsi:type="ns1:ListAllDetailsResponse">
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
-    <ns1:messageTimestamp>2017-10-06T18:46:21.50833Z</ns1:messageTimestamp>
-    <ns1:version>v1.1.1</ns1:version>
+    <ns1:messageTimestamp>2017-10-06T18:46:21.508330Z</ns1:messageTimestamp>
+    <ns1:version>v1.5.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/output/ModifyTaskRequest_example.xml b/103221-1/portal/ModifyTaskRequest_example.xml
similarity index 96%
rename from 103221-1/portal/output/ModifyTaskRequest_example.xml
rename to 103221-1/portal/ModifyTaskRequest_example.xml
index 1db578f..bb48bac 100644
--- a/103221-1/portal/output/ModifyTaskRequest_example.xml
+++ b/103221-1/portal/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.1.1</ns1:version>
+    <ns1:version>v1.5.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/output/ModifyTaskResponse_example.xml b/103221-1/portal/ModifyTaskResponse_example.xml
similarity index 93%
rename from 103221-1/portal/output/ModifyTaskResponse_example.xml
rename to 103221-1/portal/ModifyTaskResponse_example.xml
index 105124b..adfa3b5 100644
--- a/103221-1/portal/output/ModifyTaskResponse_example.xml
+++ b/103221-1/portal/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.1.1</ns1:version>
+    <ns1:version>v1.5.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/output/PingRequest_example.xml b/103221-1/portal/PingRequest_example.xml
similarity index 92%
rename from 103221-1/portal/output/PingRequest_example.xml
rename to 103221-1/portal/PingRequest_example.xml
index 6697d38..d9687b6 100644
--- a/103221-1/portal/output/PingRequest_example.xml
+++ b/103221-1/portal/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.1.1</ns1:version>
+    <ns1:version>v1.5.1</ns1:version>
     <ns1:x1TransactionId>8f9fc2c5-923a-4a75-b70c-9e0c058bba45</ns1:x1TransactionId>
   </ns1:x1RequestMessage>
 </ns1:X1Request>
diff --git a/103221-1/portal/output/PingResponse_example.xml b/103221-1/portal/PingResponse_example.xml
similarity index 93%
rename from 103221-1/portal/output/PingResponse_example.xml
rename to 103221-1/portal/PingResponse_example.xml
index fd927da..9e4dadb 100644
--- a/103221-1/portal/output/PingResponse_example.xml
+++ b/103221-1/portal/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.1.1</ns1:version>
+    <ns1:version>v1.5.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/output/RemoveAllDestinationsRequest_example.xml b/103221-1/portal/RemoveAllDestinationsRequest_example.xml
similarity index 93%
rename from 103221-1/portal/output/RemoveAllDestinationsRequest_example.xml
rename to 103221-1/portal/RemoveAllDestinationsRequest_example.xml
index 1a5c185..6b27365 100644
--- a/103221-1/portal/output/RemoveAllDestinationsRequest_example.xml
+++ b/103221-1/portal/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.1.1</ns1:version>
+    <ns1:version>v1.5.1</ns1:version>
     <ns1:x1TransactionId>88611050-d8e2-4ada-96fc-626b5dbd9cdf</ns1:x1TransactionId>
   </ns1:x1RequestMessage>
 </ns1:X1Request>
diff --git a/103221-1/portal/output/RemoveAllDestinationsResponse_example.xml b/103221-1/portal/RemoveAllDestinationsResponse_example.xml
similarity index 93%
rename from 103221-1/portal/output/RemoveAllDestinationsResponse_example.xml
rename to 103221-1/portal/RemoveAllDestinationsResponse_example.xml
index ab392cc..a057bc2 100644
--- a/103221-1/portal/output/RemoveAllDestinationsResponse_example.xml
+++ b/103221-1/portal/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.1.1</ns1:version>
+    <ns1:version>v1.5.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/output/RemoveDestinationRequest_example.xml b/103221-1/portal/RemoveDestinationRequest_example.xml
similarity index 81%
rename from 103221-1/portal/output/RemoveDestinationRequest_example.xml
rename to 103221-1/portal/RemoveDestinationRequest_example.xml
index 66277d9..a5d3ce1 100644
--- a/103221-1/portal/output/RemoveDestinationRequest_example.xml
+++ b/103221-1/portal/RemoveDestinationRequest_example.xml
@@ -3,8 +3,8 @@
   <ns1:x1RequestMessage xsi:type="ns1:RemoveDestinationRequest">
     <ns1:admfIdentifier>admfID</ns1:admfIdentifier>
     <ns1:neIdentifier>neID</ns1:neIdentifier>
-    <ns1:messageTimestamp>2017-10-06T18:46:21.47363Z</ns1:messageTimestamp>
-    <ns1:version>v1.1.1</ns1:version>
+    <ns1:messageTimestamp>2017-10-06T18:46:21.473630Z</ns1:messageTimestamp>
+    <ns1:version>v1.5.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/output/RemoveDestinationResponse_example.xml b/103221-1/portal/RemoveDestinationResponse_example.xml
similarity index 93%
rename from 103221-1/portal/output/RemoveDestinationResponse_example.xml
rename to 103221-1/portal/RemoveDestinationResponse_example.xml
index b42246b..ec910e3 100644
--- a/103221-1/portal/output/RemoveDestinationResponse_example.xml
+++ b/103221-1/portal/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.1.1</ns1:version>
+    <ns1:version>v1.5.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/output/ReportDestinationIssueRequest_example.xml b/103221-1/portal/ReportDestinationIssueRequest_example.xml
similarity index 95%
rename from 103221-1/portal/output/ReportDestinationIssueRequest_example.xml
rename to 103221-1/portal/ReportDestinationIssueRequest_example.xml
index 52ba369..0f33e2b 100644
--- a/103221-1/portal/output/ReportDestinationIssueRequest_example.xml
+++ b/103221-1/portal/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.1.1</ns1:version>
+    <ns1:version>v1.5.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/output/ReportDestinationIssueResponse_example.xml b/103221-1/portal/ReportDestinationIssueResponse_example.xml
similarity index 93%
rename from 103221-1/portal/output/ReportDestinationIssueResponse_example.xml
rename to 103221-1/portal/ReportDestinationIssueResponse_example.xml
index f6f54a0..44f3381 100644
--- a/103221-1/portal/output/ReportDestinationIssueResponse_example.xml
+++ b/103221-1/portal/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.1.1</ns1:version>
+    <ns1:version>v1.5.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/output/ReportNEIssueRequest_example.xml b/103221-1/portal/ReportNEIssueRequest_example.xml
similarity index 94%
rename from 103221-1/portal/output/ReportNEIssueRequest_example.xml
rename to 103221-1/portal/ReportNEIssueRequest_example.xml
index 4f3a8a8..b06c969 100644
--- a/103221-1/portal/output/ReportNEIssueRequest_example.xml
+++ b/103221-1/portal/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.1.1</ns1:version>
+    <ns1:version>v1.5.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/output/ReportNEIssueResponse_example.xml b/103221-1/portal/ReportNEIssueResponse_example.xml
similarity index 93%
rename from 103221-1/portal/output/ReportNEIssueResponse_example.xml
rename to 103221-1/portal/ReportNEIssueResponse_example.xml
index d234f89..ab2a6b8 100644
--- a/103221-1/portal/output/ReportNEIssueResponse_example.xml
+++ b/103221-1/portal/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.1.1</ns1:version>
+    <ns1:version>v1.5.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/output/ReportTaskIssueRequest_example.xml b/103221-1/portal/ReportTaskIssueRequest_example.xml
similarity index 94%
rename from 103221-1/portal/output/ReportTaskIssueRequest_example.xml
rename to 103221-1/portal/ReportTaskIssueRequest_example.xml
index fe3fd82..ddbe803 100644
--- a/103221-1/portal/output/ReportTaskIssueRequest_example.xml
+++ b/103221-1/portal/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.1.1</ns1:version>
+    <ns1:version>v1.5.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/output/ReportTaskIssueResponse_example.xml b/103221-1/portal/ReportTaskIssueResponse_example.xml
similarity index 93%
rename from 103221-1/portal/output/ReportTaskIssueResponse_example.xml
rename to 103221-1/portal/ReportTaskIssueResponse_example.xml
index 263a904..eac2979 100644
--- a/103221-1/portal/output/ReportTaskIssueResponse_example.xml
+++ b/103221-1/portal/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.1.1</ns1:version>
+    <ns1:version>v1.5.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/TS_103_221_01_v010401.xsd b/103221-1/portal/TS_103_221_01_v010401.xsd
deleted file mode 100644
index ef56282..0000000
--- a/103221-1/portal/TS_103_221_01_v010401.xsd
+++ /dev/null
@@ -1,861 +0,0 @@
-<?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" targetNamespace="http://uri.etsi.org/03221/X1/2017/10" xmlns:etsi103280="http://uri.etsi.org/03280/common/2017/07" version="1.4.1" elementFormDefault="qualified">
-  <xs:import namespace="http://uri.etsi.org/03280/common/2017/07"></xs:import>
-
-  <!-- Message containers -->
-  <xs:element name="X1Request" type="RequestContainer"></xs:element>
-  <xs:element name="X1Response" type="ResponseContainer"></xs:element>
-  <xs:element name="X1TopLevelErrorResponse" type="TopLevelErrorResponse"></xs:element>
-
-
-  <xs:complexType name="RequestContainer">
-    <xs:sequence>
-      <xs:element name="x1RequestMessage" type="X1RequestMessage" minOccurs="1" maxOccurs="unbounded"></xs:element>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="ResponseContainer">
-    <xs:sequence>
-      <xs:element name="x1ResponseMessage" type="X1ResponseMessage" minOccurs="1" maxOccurs="unbounded"></xs:element>
-    </xs:sequence>
-  </xs:complexType>
-  
-  <!-- Top-level Message definitions -->
-
-  <!-- See section 6.1 -->
-  <xs:complexType name="X1RequestMessage">
-    <xs:sequence>
-      <xs:element name="admfIdentifier" type="AdmfIdentifier"></xs:element>
-      <xs:element name="neIdentifier" type="NeIdentifier"></xs:element>
-      <xs:element name="messageTimestamp" type="etsi103280:QualifiedMicrosecondDateTime"></xs:element>
-      <xs:element name="version" type="Version"></xs:element>
-      <xs:element name="x1TransactionId" type="X1TransactionId"></xs:element>
-    </xs:sequence>
-  </xs:complexType>
- 
-  <!-- See section 6.1 -->
-  <xs:complexType name="X1ResponseMessage">
-    <xs:sequence>
-      <xs:element name="admfIdentifier" type="AdmfIdentifier"></xs:element>
-      <xs:element name="neIdentifier" type="NeIdentifier"></xs:element>
-      <xs:element name="messageTimestamp" type="etsi103280:QualifiedMicrosecondDateTime"></xs:element>
-      <xs:element name="version" type="Version"></xs:element>
-      <xs:element name="x1TransactionId" type="X1TransactionId"></xs:element>
-    </xs:sequence>
-  </xs:complexType>
-
-
-  <!-- See section 5.1 -->
-  <xs:simpleType name="XId">
-    <xs:restriction base="etsi103280:UUID"></xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="DId">
-    <xs:restriction base="etsi103280:UUID"></xs:restriction>
-  </xs:simpleType>
-
-  <!-- See section 5.2 -->
-  <xs:simpleType name="X1TransactionId">
-    <xs:restriction base="etsi103280:UUID"></xs:restriction>
-  </xs:simpleType>
-
-  <!-- See section 6.1 -->
-  <xs:simpleType name="AdmfIdentifier">
-    <xs:restriction base="xs:token"></xs:restriction>
-  </xs:simpleType>
-
-  <!-- See section 6.1 -->
-  <xs:simpleType name="NeIdentifier">
-    <xs:restriction base="xs:token"></xs:restriction>
-  </xs:simpleType>
-
-  <!-- See section 6.1 -->
-  <xs:simpleType name="Version">
-    <xs:restriction base="xs:string">
-      <xs:pattern value="v1.4.1"></xs:pattern>
-    </xs:restriction>
-  </xs:simpleType>
-
-
-  <!-- Error Reponse -->
-
-  <xs:complexType name="TopLevelErrorResponse">
-    <xs:sequence>
-      <xs:element name="admfIdentifier" type="AdmfIdentifier"></xs:element>
-      <xs:element name="neIdentifier" type="NeIdentifier"></xs:element>
-      <xs:element name="messageTimestamp" type="etsi103280:QualifiedMicrosecondDateTime"></xs:element>
-      <xs:element name="version" type="Version"></xs:element>
-    </xs:sequence>
-  </xs:complexType>
-  
-  <!-- see section 6.7 -->
-  <xs:complexType name="ErrorResponse">
-    <xs:complexContent>
-      <xs:extension base="X1ResponseMessage">
-        <xs:sequence>
-          <xs:element name="requestMessageType" type="RequestMessageType"></xs:element>
-          <xs:element name="errorInformation" type="ErrorInformation"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:simpleType name="RequestMessageType">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="ActivateTask"></xs:enumeration>
-      <xs:enumeration value="ModifyTask"></xs:enumeration>
-      <xs:enumeration value="DeactivateTask"></xs:enumeration>
-      <xs:enumeration value="DdeactivateAllTasks"></xs:enumeration>
-      <xs:enumeration value="GetTaskDetails"></xs:enumeration>
-      <xs:enumeration value="CreateDestination"></xs:enumeration>
-      <xs:enumeration value="ModifyDestination"></xs:enumeration>
-      <xs:enumeration value="RemoveDestination"></xs:enumeration>
-      <xs:enumeration value="RemoveAllDestinations"></xs:enumeration>
-      <xs:enumeration value="GetDestinationDetails"></xs:enumeration>
-      <xs:enumeration value="GetNEStatus"></xs:enumeration>
-      <xs:enumeration value="GetAllDetails"></xs:enumeration>
-      <xs:enumeration value="ListAllDetails"></xs:enumeration>
-      <xs:enumeration value="ReportTaskIssue"></xs:enumeration>
-      <xs:enumeration value="ReportDestinationIssue"></xs:enumeration>
-      <xs:enumeration value="ReportNEIssue"></xs:enumeration>
-      <xs:enumeration value="Ping"></xs:enumeration>
-      <xs:enumeration value="Keepalive"></xs:enumeration>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:complexType name="ErrorInformation">
-    <xs:sequence>
-      <xs:element name="errorCode" type="xs:integer"></xs:element>
-      <xs:element name="errorDescription" type="xs:string"></xs:element>
-    </xs:sequence>
-  </xs:complexType>
-  
-
-  <!-- Individual Message Definitions -->
-  
-  <!-- see section 6.2.1 -->
-  <xs:complexType name="ActivateTaskRequest">
-    <xs:complexContent>
-      <xs:extension base="X1RequestMessage">
-        <xs:sequence>
-          <xs:element name="taskDetails" type="TaskDetails"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <!-- see section 6.2.1.2 -->
-  <xs:complexType name="TaskDetails">
-    <xs:sequence>
-      <xs:element name="xId" type="XId"></xs:element>
-      <xs:element name="targetIdentifiers" type="ListOfTargetIdentifiers"></xs:element>
-      <xs:element name="deliveryType" type="DeliveryType"></xs:element>
-      <xs:element name="listOfDIDs" type="ListOfDids"></xs:element>
-      <xs:element name="listOfMediationDetails" type="ListOfMediationDetails" minOccurs="0"></xs:element>
-      <xs:element name="correlationID" type="xs:nonNegativeInteger" minOccurs="0"></xs:element>
-      <xs:element name="implicitDeactivationAllowed" type="xs:boolean" minOccurs="0"></xs:element>
-      <xs:element name="taskDetailsExtensions" type="TaskDetailsExtensions" minOccurs="0"></xs:element>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="ListOfTargetIdentifiers">
-    <xs:sequence>
-      <xs:element name="targetIdentifier" type="TargetIdentifier" minOccurs="1" maxOccurs="unbounded"></xs:element>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="TargetIdentifier">
-    <xs:choice>
-      <xs:element name="e164Number" type="etsi103280:InternationalE164"></xs:element>
-      <xs:element name="imsi" type="etsi103280:IMSI"></xs:element>
-      <xs:element name="imei" type="etsi103280:IMEI"></xs:element>
-      <xs:element name="macAddress" type="etsi103280:MACAddress"></xs:element>
-      <xs:element name="ipv4Address" type="etsi103280:IPv4Address"></xs:element>
-      <xs:element name="ipv6Address" type="etsi103280:IPv6Address"></xs:element>
-      <xs:element name="ipv4Cidr" type="etsi103280:IPCIDR"></xs:element>
-      <xs:element name="ipv6Cidr" type="etsi103280:IPv6CIDR"></xs:element>
-      <xs:element name="tcpPort" type="etsi103280:TCPPort"></xs:element>
-      <xs:element name="tcpPortRange" type="etsi103280:TCPPortRange"></xs:element>
-      <xs:element name="udpPort" type="etsi103280:UDPPort"></xs:element>
-      <xs:element name="udpPortRange" type="etsi103280:UDPPortRange"></xs:element>
-      <xs:element name="emailAddress" type="etsi103280:EmailAddress"></xs:element>
-      <xs:element name="sipUri" type="etsi103280:SIPURI"></xs:element>
-      <xs:element name="telUri" type="etsi103280:TELURI"></xs:element>
-      <xs:element name="h323Uri" type="H323Uri"></xs:element>
-      <xs:element name="impu" type="Impu"></xs:element>
-      <xs:element name="impi" type="Impi"></xs:element>
-      <xs:element name="nai" type="etsi103280:NAI"></xs:element>
-      <xs:element name="radiusAttribute" type="xs:hexBinary"></xs:element>
-      <xs:element name="gtpuTunnelId" type="GtpTunnelId"></xs:element>
-      <xs:element name="gtpcTunnelId" type="GtpTunnelId"></xs:element>
-      <xs:element name="callPartyRole" type="CallPartyRole"></xs:element>
-      <xs:element name="nonLocalIdentifier" type="NonLocalIdentifier"></xs:element>
-      <xs:element name="supiimsi" type="etsi103280:SUPIIMSI"></xs:element>
-      <xs:element name="supinai" type="etsi103280:SUPINAI"></xs:element>
-      <xs:element name="suci" type="etsi103280:SUCI"></xs:element>
-      <xs:element name="peiImei" type="etsi103280:PEIIMEI"></xs:element>
-      <xs:element name="peiImeiCheckDigit" type="etsi103280:PEIIMEICheckDigit"></xs:element>
-      <xs:element name="peiImeisv" type="etsi103280:PEIIMEISV"></xs:element>
-      <xs:element name="gpsiMsisdn" type="etsi103280:GPSIMSISDN"></xs:element>
-      <xs:element name="gpsiNai" type="etsi103280:GPSINAI"></xs:element>
-      <xs:element name="targetIdentifierExtension" type="TargetIdentifierExtension"></xs:element>
-    </xs:choice>
-  </xs:complexType>
-
-  <xs:simpleType name="H323Uri">
-    <xs:restriction base="xs:string">
-      <xs:pattern value="^h323:[a-zA-Z0-9!#$&amp;-;=?-\[\]_~%]+$"></xs:pattern>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="Impu">
-    <xs:restriction base="xs:string">
-      <xs:pattern value="^[a-zA-Z0-9!#$&amp;-;=?-\[\]_~%]+$"></xs:pattern>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="Impi">
-    <xs:restriction base="xs:string">
-      <xs:pattern value="^[a-zA-Z0-9!#$&amp;-;=?-\[\]_~%]+$"></xs:pattern>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="GtpTunnelId">
-    <xs:restriction base="xs:integer">
-      <xs:minInclusive value="0"></xs:minInclusive>
-      <xs:maxInclusive value="4294967296"></xs:maxInclusive>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="CallPartyRole">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="Originating"></xs:enumeration>
-      <xs:enumeration value="Terminating"></xs:enumeration>
-      <xs:enumeration value="Forwarded-To"></xs:enumeration>
-    </xs:restriction>
-  </xs:simpleType>
-  
-  <xs:simpleType name="NonLocalIdentifier">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="Local"></xs:enumeration>
-      <xs:enumeration value="NonLocal"></xs:enumeration>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:complexType name="TargetIdentifierExtension">
-    <xs:complexContent>
-      <xs:extension base="Extension"></xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name="MediationDetails">
-    <xs:sequence>
-      <xs:element name="LIID" type="etsi103280:LIID"></xs:element>
-      <xs:element name="deliveryType" type="MediationDeliveryType"></xs:element>
-      <xs:element name="StartTime" type="etsi103280:QualifiedMicrosecondDateTime" minOccurs="0"></xs:element>
-      <xs:element name="EndTime" type="etsi103280:QualifiedMicrosecondDateTime" minOccurs="0"></xs:element>
-      <xs:element name="listOfDIDs" type="ListOfDids" minOccurs="0"></xs:element>
-      <xs:element name="mediationDetailsExtensions" type="MediationDetailsExtensions" minOccurs="0"></xs:element>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:simpleType name="DeliveryType">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="X2Only"></xs:enumeration>
-      <xs:enumeration value="X3Only"></xs:enumeration>
-      <xs:enumeration value="X2andX3"></xs:enumeration>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="MediationDeliveryType">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="HI2Only"></xs:enumeration>
-      <xs:enumeration value="HI3Only"></xs:enumeration>
-      <xs:enumeration value="HI2andHI3"></xs:enumeration>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:complexType name="ListOfDids">
-    <xs:sequence>
-      <xs:element name="dId" type="DId" minOccurs="0" maxOccurs="unbounded"></xs:element>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="ListOfMediationDetails">
-    <xs:sequence>
-      <xs:element name="mediationDetails" type="MediationDetails" minOccurs="0" maxOccurs="unbounded"></xs:element>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="TaskDetailsExtensions">
-    <xs:complexContent>
-      <xs:extension base="Extension"></xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name="MediationDetailsExtensions">
-    <xs:complexContent>
-      <xs:extension base="Extension"></xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name="Extension">
-    <xs:sequence>
-      <xs:element name="Owner" type="xs:string"></xs:element>
-      <xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded"></xs:any>
-    </xs:sequence>
-  </xs:complexType>
-
-  <!-- see section 6.2.1 -->
-  <xs:complexType name="ActivateTaskResponse">
-    <xs:complexContent>
-      <xs:extension base="X1ResponseMessage">
-        <xs:sequence>
-          <xs:element name="oK" type="OK"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:simpleType name="OK">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="AcknowledgedAndCompleted"></xs:enumeration>
-      <xs:enumeration value="Acknowledged"></xs:enumeration>
-    </xs:restriction>
-  </xs:simpleType>
-  
-  <xs:simpleType name="OKAckAndComplete">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="AcknowledgedAndCompleted"></xs:enumeration>
-    </xs:restriction>
-  </xs:simpleType>
-
-  
-  
-  <!-- see section 6.2.2 -->
-  <xs:complexType name="ModifyTaskRequest">
-    <xs:complexContent>
-      <xs:extension base="X1RequestMessage">
-        <xs:sequence>
-          <xs:element name="taskDetails" type="TaskDetails"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <!-- see section 6.2.2 -->
-  <xs:complexType name="ModifyTaskResponse">
-    <xs:complexContent>
-      <xs:extension base="X1ResponseMessage">
-        <xs:sequence>
-          <xs:element name="oK" type="OK"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-
-  <!-- see section 6.2.3 -->
-  <xs:complexType name="DeactivateTaskRequest">
-    <xs:complexContent>
-      <xs:extension base="X1RequestMessage">
-        <xs:sequence>
-          <xs:element name="xId" type="XId"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <!-- see section 6.2.3 -->  
-  <xs:complexType name="DeactivateTaskResponse">
-    <xs:complexContent>
-      <xs:extension base="X1ResponseMessage">
-        <xs:sequence>
-          <xs:element name="oK" type="OK"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>  
-
-
-  <!-- see section 6.2.4 -->
-  <xs:complexType name="DeactivateAllTasksRequest">
-    <xs:complexContent>
-      <xs:extension base="X1RequestMessage">
-        <xs:sequence>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <!-- see section 6.2.4 -->
-  <xs:complexType name="DeactivateAllTasksResponse">
-    <xs:complexContent>
-      <xs:extension base="X1ResponseMessage">
-        <xs:sequence>
-          <xs:element name="oK" type="OK"></xs:element>          
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  
-  <!-- see section 6.3.1 -->
-  <xs:complexType name="CreateDestinationRequest">
-    <xs:complexContent>
-      <xs:extension base="X1RequestMessage">
-        <xs:sequence>
-          <xs:element name="destinationDetails" type="DestinationDetails"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <!-- see sextion 6.3.1.2 -->
-  <xs:complexType name="DestinationDetails">
-    <xs:sequence>
-      <xs:element name="dId" type="DId"></xs:element>
-      <xs:element name="friendlyName" type="xs:string" minOccurs="0"></xs:element>
-      <xs:element name="deliveryType" type="DeliveryType"></xs:element>
-      <xs:element name="deliveryAddress" type="DeliveryAddress"></xs:element>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="DeliveryAddress">
-    <xs:choice>
-      <xs:element name="ipAddressAndPort" type="etsi103280:IPAddressPort"></xs:element>
-      <xs:element name="e164Number" type="etsi103280:InternationalE164"></xs:element>
-      <xs:element name="uri" type="xs:anyURI"></xs:element>
-      <xs:element name="emailAddress" type="etsi103280:EmailAddress"></xs:element>
-    </xs:choice>
-  </xs:complexType>
-
-  <!-- see section 6.3.1 -->
-  <xs:complexType name="CreateDestinationResponse">
-    <xs:complexContent>
-      <xs:extension base="X1ResponseMessage">
-        <xs:sequence>
-          <xs:element name="oK" type="OK"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  
-  
-  <!-- see section 6.3.2 -->
-  <xs:complexType name="ModifyDestinationRequest">
-    <xs:complexContent>
-      <xs:extension base="X1RequestMessage">
-        <xs:sequence>
-          <xs:element name="destinationDetails" type="DestinationDetails"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <!-- see section 6.3.2 -->
-  <xs:complexType name="ModifyDestinationResponse">
-    <xs:complexContent>
-      <xs:extension base="X1ResponseMessage">
-        <xs:sequence>
-          <xs:element name="oK" type="OK"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-
-
-  <!-- see section 6.3.3 -->
-  <xs:complexType name="RemoveDestinationRequest">
-    <xs:complexContent>
-      <xs:extension base="X1RequestMessage">
-        <xs:sequence>
-          <xs:element name="dId" type="DId"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <!-- see section 6.3.3 -->
-  <xs:complexType name="RemoveDestinationResponse">
-    <xs:complexContent>
-      <xs:extension base="X1ResponseMessage">
-        <xs:sequence>
-          <xs:element name="oK" type="OK"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-
-  <!-- see section 6.3.4 -->
-  <xs:complexType name="RemoveAllDestinationsRequest">
-    <xs:complexContent>
-      <xs:extension base="X1RequestMessage">
-        <xs:sequence>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <!-- see section 6.3.4 -->
-  <xs:complexType name="RemoveAllDestinationsResponse">
-    <xs:complexContent>
-      <xs:extension base="X1ResponseMessage">
-        <xs:sequence>
-          <xs:element name="oK" type="OK"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-
-  <!-- see section 6.4.2 -->
-  <xs:complexType name="GetTaskDetailsRequest">
-    <xs:complexContent>
-      <xs:extension base="X1RequestMessage">
-        <xs:sequence>
-          <xs:element name="xId" type="XId"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <!-- see section 6.4.2 -->
-  <xs:complexType name="GetTaskDetailsResponse">
-    <xs:complexContent>
-      <xs:extension base="X1ResponseMessage">
-        <xs:sequence>
-          <xs:element name="taskResponseDetails" type="TaskResponseDetails"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name="TaskResponseDetails">
-    <xs:sequence>
-      <xs:element name="taskDetails" type="TaskDetails"></xs:element>
-      <xs:element name="taskStatus" type="TaskStatus"></xs:element>
-    </xs:sequence>
-  </xs:complexType>
-
-  <!-- see section 6.4.2.2 -->
-  <xs:complexType name="TaskStatus">
-    <xs:sequence>
-      <xs:element name="provisioningStatus" type="ProvisioningStatus"></xs:element>
-      <xs:element name="listOfFaults" type="ListOfFaults"></xs:element>
-      <xs:element name="timeOfLastIntercept" type="etsi103280:QualifiedMicrosecondDateTime" minOccurs="0"></xs:element>
-      <xs:element name="amountOfX2Data" type="xs:integer" minOccurs="0"></xs:element>
-      <xs:element name="amountOfX3Data" type="xs:integer" minOccurs="0"></xs:element>
-      <xs:element name="timeOfLastModification" type="etsi103280:QualifiedMicrosecondDateTime" minOccurs="0"></xs:element>
-      <xs:element name="numberOfModifications" type="xs:integer" minOccurs="0"></xs:element>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:simpleType name="ProvisioningStatus">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="awaitingProvisioning"></xs:enumeration>
-      <xs:enumeration value="failed"></xs:enumeration>
-      <xs:enumeration value="complete"></xs:enumeration>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:complexType name="ListOfFaults">
-    <xs:sequence>
-      <xs:element name="unresolvedFault" type="ErrorInformation" minOccurs="0" maxOccurs="unbounded"></xs:element>
-    </xs:sequence>
-  </xs:complexType>
-  
-  <!-- see section 6.4.3 -->
-  <xs:complexType name="GetDestinationDetailsRequest">
-    <xs:complexContent>
-      <xs:extension base="X1RequestMessage">
-        <xs:sequence>
-          <xs:element name="dId" type="DId"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <!-- see section 6.4.3 -->
-  <xs:complexType name="GetDestinationDetailsResponse">
-    <xs:complexContent>
-      <xs:extension base="X1ResponseMessage">
-        <xs:sequence>
-          <xs:element name="destinationResponseDetails" type="DestinationResponseDetails"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name="DestinationResponseDetails">
-    <xs:sequence>
-      <xs:element name="destinationDetails" type="DestinationDetails"></xs:element>
-      <xs:element name="destinationStatus" type="DestinationStatus"></xs:element>
-    </xs:sequence>
-  </xs:complexType>
-
-  <!-- see section 6.4.3.2 -->
-  <xs:complexType name="DestinationStatus">
-      <xs:sequence>
-        <xs:element name="destinationDeliveryStatus" type="DestinationDeliveryStatus"></xs:element>
-        <xs:element name="listOfFaults" type="ListOfFaults"></xs:element>
-      </xs:sequence>
-  </xs:complexType>
-
-  <xs:simpleType name="DestinationDeliveryStatus">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="activeAndWorking"></xs:enumeration>
-      <xs:enumeration value="deliveryFault"></xs:enumeration>
-    </xs:restriction>
-  </xs:simpleType>    
-
-  <!-- see section 6.4.4 -->
-  <xs:complexType name="GetNEStatusRequest">
-    <xs:complexContent>
-      <xs:extension base="X1RequestMessage">
-        <xs:sequence>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <!-- see section 6.4.4 -->
-  <xs:complexType name="GetNEStatusResponse">
-    <xs:complexContent>
-      <xs:extension base="X1ResponseMessage">
-        <xs:sequence>
-          <xs:element name="neStatusDetails" type="NeStatusDetails"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name="NeStatusDetails">
-    <xs:sequence>
-      <xs:element name="neStatus" type="NeStatus"></xs:element>
-      <xs:element name="listOfFaults" type="ListOfFaults"></xs:element>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:simpleType name="NeStatus">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="OK"></xs:enumeration>
-      <xs:enumeration value="Faults"></xs:enumeration>
-    </xs:restriction>
-  </xs:simpleType>  
-    
-    
-  <!-- see section 6.4.5 -->
-  <xs:complexType name="GetAllDetailsRequest">
-    <xs:complexContent>
-      <xs:extension base="X1RequestMessage">
-        <xs:sequence>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <!-- see section 6.4.5 -->
-  <xs:complexType name="GetAllDetailsResponse">
-    <xs:complexContent>
-      <xs:extension base="X1ResponseMessage">
-        <xs:sequence>
-          <xs:element name="neStatusDetails" type="NeStatusDetails"></xs:element>
-          <xs:element name="listOfTaskResponseDetails" type="ListOfTaskResponseDetails"></xs:element>
-          <xs:element name="listOfDestinationResponseDetails" type="ListOfDestinationResponseDetails"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name="ListOfTaskResponseDetails">
-    <xs:sequence>
-      <xs:element name="taskResponseDetails" type="TaskResponseDetails" minOccurs="0" maxOccurs="unbounded"></xs:element>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="ListOfDestinationResponseDetails">
-    <xs:sequence>
-      <xs:element name="destinationResponseDetails" type="DestinationResponseDetails" minOccurs="0" maxOccurs="unbounded"></xs:element>
-    </xs:sequence>
-  </xs:complexType>
-
-
-  <!-- see section 6.4.6 -->
-  <xs:complexType name="ListAllDetailsRequest">
-    <xs:complexContent>
-      <xs:extension base="X1RequestMessage">
-        <xs:sequence>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <!-- see section 6.4.6 -->
-  <xs:complexType name="ListAllDetailsResponse">
-    <xs:complexContent>
-      <xs:extension base="X1ResponseMessage">
-        <xs:sequence>
-          <xs:element name="ListOfXIDs" type="ListOfXids"></xs:element>
-          <xs:element name="ListOfDIDs" type="ListOfDids"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name="ListOfXids">
-    <xs:sequence>
-      <xs:element name="xId" type="XId" minOccurs="0" maxOccurs="unbounded"></xs:element>
-    </xs:sequence>
-  </xs:complexType>  
-
-
-  <!-- see section  6.5.2 -->
-  <xs:complexType name="ReportTaskIssueRequest">
-    <xs:complexContent>
-      <xs:extension base="X1RequestMessage">
-        <xs:sequence>
-          <xs:element name="xId" type="XId"></xs:element>
-          <xs:element name="taskReportType" type="TaskReportType"></xs:element>
-          <xs:element name="taskIssueErrorCode" type="xs:integer" minOccurs="0"></xs:element>
-          <xs:element name="taskIssueDetails" type="xs:string" minOccurs="0"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <!-- see section 6.4.2.2 -->
-  <xs:simpleType name="TaskReportType">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="AllClear"></xs:enumeration>
-      <xs:enumeration value="Warning"></xs:enumeration>
-      <xs:enumeration value="NonTerminatingFault"></xs:enumeration>
-      <xs:enumeration value="TerminatingFault"></xs:enumeration>
-      <xs:enumeration value="ImplicitDeactivation"></xs:enumeration>
-      <xs:enumeration value="FullyActionedAndSuccesful"></xs:enumeration>
-      <xs:enumeration value="FullyActionedAndUnsuccesful"></xs:enumeration>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <!-- see section  6.5.2 -->
-  <xs:complexType name="ReportTaskIssueResponse">
-    <xs:complexContent>
-      <xs:extension base="X1ResponseMessage">
-        <xs:sequence>
-          <xs:element name="oK" type="OK"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  
-  
-  <!-- see section  6.5.3 -->
-  <xs:complexType name="ReportDestinationIssueRequest">
-    <xs:complexContent>
-      <xs:extension base="X1RequestMessage">
-        <xs:sequence>
-          <xs:element name="dId" type="DId"></xs:element>
-          <xs:element name="destinationReportType" type="TaskReportType"></xs:element>
-          <xs:element name="destinationIssueErrorCode" type="xs:integer" minOccurs="0"></xs:element>
-          <xs:element name="destinationIssueDetails" type="xs:string" minOccurs="0"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <!-- see section  6.5.3 -->
-  <xs:complexType name="ReportDestinationIssueResponse">
-    <xs:complexContent>
-      <xs:extension base="X1ResponseMessage">
-        <xs:sequence>
-          <xs:element name="oK" type="OK"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  
-  
-  <!-- see section 6.5.4 -->
-  <xs:complexType name="ReportNEIssueRequest">
-    <xs:complexContent>
-      <xs:extension base="X1RequestMessage">
-        <xs:sequence>
-          <xs:element name="typeOfNeIssueMessage" type="TypeOfNeIssueMessage"></xs:element>
-          <xs:element name="description" type="xs:string"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <!-- see section 6.5.4 -->
-  <xs:simpleType name="TypeOfNeIssueMessage">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="Warning"></xs:enumeration>
-      <xs:enumeration value="FaultCleared"></xs:enumeration>
-      <xs:enumeration value="FaultReport"></xs:enumeration>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <!-- see section 6.5.4 -->
-  <xs:complexType name="ReportNEIssueResponse">
-    <xs:complexContent>
-      <xs:extension base="X1ResponseMessage">
-        <xs:sequence>
-          <xs:element name="oK" type="OKAckAndComplete"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-
-  <!-- see section 6.6.1 -->
-  <xs:complexType name="PingRequest">
-    <xs:complexContent>
-      <xs:extension base="X1RequestMessage">
-        <xs:sequence>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <!-- see section 6.6.1 -->
-  <xs:complexType name="PingResponse">
-    <xs:complexContent>
-      <xs:extension base="X1ResponseMessage">
-        <xs:sequence>
-          <xs:element name="oK" type="OK"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-
-  <!-- see section 6.6.2 -->
-  <xs:complexType name="KeepaliveRequest">
-    <xs:complexContent>
-      <xs:extension base="X1RequestMessage">
-        <xs:sequence>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <!-- see section 6.6.2 -->
-  <xs:complexType name="KeepaliveResponse">
-    <xs:complexContent>
-      <xs:extension base="X1ResponseMessage">
-        <xs:sequence>
-          <xs:element name="oK" type="OK"></xs:element>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-
-
-</xs:schema>
diff --git a/103221-1/portal/TS_103_221_01_v010501.xsd b/103221-1/portal/TS_103_221_01_v010501.xsd
new file mode 100644
index 0000000..cb1ebf0
--- /dev/null
+++ b/103221-1/portal/TS_103_221_01_v010501.xsd
@@ -0,0 +1,789 @@
+<?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:import namespace="http://uri.etsi.org/03280/common/2017/07"/>
+	<!-- Message containers -->
+	<xs:element name="X1Request" type="RequestContainer"/>
+	<xs:element name="X1Response" type="ResponseContainer"/>
+	<xs:element name="X1TopLevelErrorResponse" type="TopLevelErrorResponse"/>
+	<xs:complexType name="RequestContainer">
+		<xs:sequence>
+			<xs:element name="x1RequestMessage" type="X1RequestMessage" minOccurs="1" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="ResponseContainer">
+		<xs:sequence>
+			<xs:element name="x1ResponseMessage" type="X1ResponseMessage" minOccurs="1" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!-- Top-level Message definitions -->
+	<!-- See section 6.1 -->
+	<xs:complexType name="X1RequestMessage">
+		<xs:sequence>
+			<xs:element name="admfIdentifier" type="AdmfIdentifier"/>
+			<xs:element name="neIdentifier" type="NeIdentifier"/>
+			<xs:element name="messageTimestamp" type="etsi103280:QualifiedMicrosecondDateTime"/>
+			<xs:element name="version" type="Version"/>
+			<xs:element name="x1TransactionId" type="X1TransactionId"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!-- See section 6.1 -->
+	<xs:complexType name="X1ResponseMessage">
+		<xs:sequence>
+			<xs:element name="admfIdentifier" type="AdmfIdentifier"/>
+			<xs:element name="neIdentifier" type="NeIdentifier"/>
+			<xs:element name="messageTimestamp" type="etsi103280:QualifiedMicrosecondDateTime"/>
+			<xs:element name="version" type="Version"/>
+			<xs:element name="x1TransactionId" type="X1TransactionId"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!-- See section 5.1 -->
+	<xs:simpleType name="XId">
+		<xs:restriction base="etsi103280:UUID"/>
+	</xs:simpleType>
+	<xs:simpleType name="DId">
+		<xs:restriction base="etsi103280:UUID"/>
+	</xs:simpleType>
+	<!-- See section 5.2 -->
+	<xs:simpleType name="X1TransactionId">
+		<xs:restriction base="etsi103280:UUID"/>
+	</xs:simpleType>
+	<!-- See section 6.1 -->
+	<xs:simpleType name="AdmfIdentifier">
+		<xs:restriction base="xs:token"/>
+	</xs:simpleType>
+	<!-- See section 6.1 -->
+	<xs:simpleType name="NeIdentifier">
+		<xs:restriction base="xs:token"/>
+	</xs:simpleType>
+	<!-- See section 6.1 -->
+	<xs:simpleType name="Version">
+		<xs:restriction base="xs:string">
+			<xs:pattern value="v1.5.1"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!-- Error Reponse -->
+	<xs:complexType name="TopLevelErrorResponse">
+		<xs:sequence>
+			<xs:element name="admfIdentifier" type="AdmfIdentifier"/>
+			<xs:element name="neIdentifier" type="NeIdentifier"/>
+			<xs:element name="messageTimestamp" type="etsi103280:QualifiedMicrosecondDateTime"/>
+			<xs:element name="version" type="Version"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!-- See section 6.7 -->
+	<xs:complexType name="ErrorResponse">
+		<xs:complexContent>
+			<xs:extension base="X1ResponseMessage">
+				<xs:sequence>
+					<xs:element name="requestMessageType" type="RequestMessageType"/>
+					<xs:element name="errorInformation" type="ErrorInformation"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:simpleType name="RequestMessageType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="ActivateTask"/>
+			<xs:enumeration value="ModifyTask"/>
+			<xs:enumeration value="DeactivateTask"/>
+			<xs:enumeration value="DeactivateAllTasks"/>
+			<xs:enumeration value="GetTaskDetails"/>
+			<xs:enumeration value="CreateDestination"/>
+			<xs:enumeration value="ModifyDestination"/>
+			<xs:enumeration value="RemoveDestination"/>
+			<xs:enumeration value="RemoveAllDestinations"/>
+			<xs:enumeration value="GetDestinationDetails"/>
+			<xs:enumeration value="GetNEStatus"/>
+			<xs:enumeration value="GetAllDetails"/>
+			<xs:enumeration value="ListAllDetails"/>
+			<xs:enumeration value="ReportTaskIssue"/>
+			<xs:enumeration value="ReportDestinationIssue"/>
+			<xs:enumeration value="ReportNEIssue"/>
+			<xs:enumeration value="Ping"/>
+			<xs:enumeration value="Keepalive"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:complexType name="ErrorInformation">
+		<xs:sequence>
+			<xs:element name="errorCode" type="xs:integer"/>
+			<xs:element name="errorDescription" type="xs:string"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!-- Individual Message Definitions -->
+	<!-- See section 6.2.1 -->
+	<xs:complexType name="ActivateTaskRequest">
+		<xs:complexContent>
+			<xs:extension base="X1RequestMessage">
+				<xs:sequence>
+					<xs:element name="taskDetails" type="TaskDetails"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!-- See section 6.2.1.2 -->
+	<xs:complexType name="TaskDetails">
+		<xs:sequence>
+			<xs:element name="xId" type="XId"/>
+			<xs:element name="targetIdentifiers" type="ListOfTargetIdentifiers"/>
+			<xs:element name="deliveryType" type="DeliveryType"/>
+			<xs:element name="listOfDIDs" type="ListOfDids"/>
+			<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="taskDetailsExtensions" type="TaskDetailsExtensions" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="ListOfTargetIdentifiers">
+		<xs:sequence>
+			<xs:element name="targetIdentifier" type="TargetIdentifier" minOccurs="1" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="TargetIdentifier">
+		<xs:choice>
+			<xs:element name="e164Number" type="etsi103280:InternationalE164"/>
+			<xs:element name="imsi" type="etsi103280:IMSI"/>
+			<xs:element name="imei" type="etsi103280:IMEI"/>
+			<xs:element name="macAddress" type="etsi103280:MACAddress"/>
+			<xs:element name="ipv4Address" type="etsi103280:IPv4Address"/>
+			<xs:element name="ipv6Address" type="etsi103280:IPv6Address"/>
+			<xs:element name="ipv4Cidr" type="etsi103280:IPCIDR"/>
+			<xs:element name="ipv6Cidr" type="etsi103280:IPv6CIDR"/>
+			<xs:element name="tcpPort" type="etsi103280:TCPPort"/>
+			<xs:element name="tcpPortRange" type="etsi103280:TCPPortRange"/>
+			<xs:element name="udpPort" type="etsi103280:UDPPort"/>
+			<xs:element name="udpPortRange" type="etsi103280:UDPPortRange"/>
+			<xs:element name="emailAddress" type="etsi103280:EmailAddress"/>
+			<xs:element name="sipUri" type="etsi103280:SIPURI"/>
+			<xs:element name="telUri" type="etsi103280:TELURI"/>
+			<xs:element name="h323Uri" type="H323Uri"/>
+			<xs:element name="impu" type="Impu"/>
+			<xs:element name="impi" type="Impi"/>
+			<xs:element name="nai" type="etsi103280:NAI"/>
+			<xs:element name="radiusAttribute" type="xs:hexBinary"/>
+			<xs:element name="gtpuTunnelId" type="GtpTunnelId"/>
+			<xs:element name="gtpcTunnelId" type="GtpTunnelId"/>
+			<xs:element name="callPartyRole" type="CallPartyRole"/>
+			<xs:element name="nonLocalIdentifier" type="NonLocalIdentifier"/>
+			<xs:element name="supiimsi" type="etsi103280:SUPIIMSI"/>
+			<xs:element name="supinai" type="etsi103280:SUPINAI"/>
+			<xs:element name="suci" type="etsi103280:SUCI"/>
+			<xs:element name="peiImei" type="etsi103280:PEIIMEI"/>
+			<xs:element name="peiImeiCheckDigit" type="etsi103280:PEIIMEICheckDigit"/>
+			<xs:element name="peiImeisv" type="etsi103280:PEIIMEISV"/>
+			<xs:element name="gpsiMsisdn" type="etsi103280:GPSIMSISDN"/>
+			<xs:element name="gpsiNai" type="etsi103280:GPSINAI"/>
+			<xs:element name="targetIdentifierExtension" type="TargetIdentifierExtension"/>
+		</xs:choice>
+	</xs:complexType>
+	<xs:simpleType name="H323Uri">
+		<xs:restriction base="xs:string">
+			<xs:pattern value="^h323:[a-zA-Z0-9!#$&amp;-;=?-\[\]_~%]+$"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="Impu">
+		<xs:restriction base="xs:string">
+			<xs:pattern value="^[a-zA-Z0-9!#$&amp;-;=?-\[\]_~%]+$"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="Impi">
+		<xs:restriction base="xs:string">
+			<xs:pattern value="^[a-zA-Z0-9!#$&amp;-;=?-\[\]_~%]+$"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="GtpTunnelId">
+		<xs:restriction base="xs:integer">
+			<xs:minInclusive value="0"/>
+			<xs:maxInclusive value="4294967296"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="CallPartyRole">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Originating"/>
+			<xs:enumeration value="Terminating"/>
+			<xs:enumeration value="Forwarded-To"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="NonLocalIdentifier">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Local"/>
+			<xs:enumeration value="NonLocal"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:complexType name="TargetIdentifierExtension">
+		<xs:complexContent>
+			<xs:extension base="Extension"/>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="MediationDetails">
+		<xs:sequence>
+			<xs:element name="LIID" type="etsi103280:LIID"/>
+			<xs:element name="deliveryType" type="MediationDeliveryType"/>
+			<xs:element name="StartTime" type="etsi103280:QualifiedMicrosecondDateTime" minOccurs="0"/>
+			<xs:element name="EndTime" type="etsi103280:QualifiedMicrosecondDateTime" minOccurs="0"/>
+			<xs:element name="listOfDIDs" type="ListOfDids" minOccurs="0"/>
+			<xs:element name="mediationDetailsExtensions" type="MediationDetailsExtensions" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="serviceScopingOptions" type="ListOfServiceScopingOptions" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="ListOfServiceScopingOptions">
+		<xs:sequence>
+			<xs:element name="serviceScopingOptions" type="ServiceScopingOptions" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name=" ServiceScopingOptions">
+		<xs:sequence>
+			<xs:element name="serviceType" type="ListOfServiceTypes" minOccurs="0"/>
+			<xs:element name="locationType" type="LocationTypeOptions" minOccurs="0"/>
+			<xs:element name="suspendOnOutboundInternationalRoaming" type="xs:boolean" minOccurs="0"/>
+			<xs:element name="reportPostDialledDigits" type="xs:boolean" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="ListOfServiceTypes">
+		<xs:sequence>
+			<xs:element name="serviceType" type="ServiceType" minOccurs="1" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:simpleType name="ServiceType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="voice"/>
+			<xs:enumeration value="data"/>
+			<xs:enumeration value="messaging"/>
+			<xs:enumeration value="pushToTalk"/>
+			<xs:enumeration value="LALS"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:complexType name="LocationTypeOptions">
+		<xs:choice>
+			<xs:element name="doNotReport" type="xs:string" fixed=""/>
+			<xs:element name="listOfLocationTypes" type="ListOfLocationTypes"/>
+		</xs:choice>
+	</xs:complexType>
+	 <xs:complexType name=" ListOfLocationTypes ">
+		<xs:sequence>
+			<xs:element name="locationType" type="LocationType" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="LocationType">
+		<xs:sequence>
+			<xs:element name="beginningAndEnd" type="xs:boolean" minOccurs="0"/>
+			<xs:element name="uponChange" type="xs:boolean" minOccurs="0"/>
+			<xs:element name="LALS" type="xs:boolean" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:simpleType name="DeliveryType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="X2Only"/>
+			<xs:enumeration value="X3Only"/>
+			<xs:enumeration value="X2andX3"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="MediationDeliveryType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="HI2Only"/>
+			<xs:enumeration value="HI3Only"/>
+			<xs:enumeration value="HI2andHI3"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:complexType name="ListOfDids">
+		<xs:sequence>
+			<xs:element name="dId" type="DId" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="ListOfMediationDetails">
+		<xs:sequence>
+			<xs:element name="mediationDetails" type="MediationDetails" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="TaskDetailsExtensions">
+		<xs:complexContent>
+			<xs:extension base="Extension"/>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="MediationDetailsExtensions">
+		<xs:complexContent>
+			<xs:extension base="Extension"/>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="Extension">
+		<xs:sequence>
+			<xs:element name="Owner" type="xs:string"/>
+			<xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!-- See section 6.2.1 -->
+	<xs:complexType name="ActivateTaskResponse">
+		<xs:complexContent>
+			<xs:extension base="X1ResponseMessage">
+				<xs:sequence>
+					<xs:element name="oK" type="OK"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:simpleType name="OK">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="AcknowledgedAndCompleted"/>
+			<xs:enumeration value="Acknowledged"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="OKAckAndComplete">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="AcknowledgedAndCompleted"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!-- See section 6.2.2 -->
+	<xs:complexType name="ModifyTaskRequest">
+		<xs:complexContent>
+			<xs:extension base="X1RequestMessage">
+				<xs:sequence>
+					<xs:element name="taskDetails" type="TaskDetails"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!-- See section 6.2.2 -->
+	<xs:complexType name="ModifyTaskResponse">
+		<xs:complexContent>
+			<xs:extension base="X1ResponseMessage">
+				<xs:sequence>
+					<xs:element name="oK" type="OK"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!-- See section 6.2.3 -->
+	<xs:complexType name="DeactivateTaskRequest">
+		<xs:complexContent>
+			<xs:extension base="X1RequestMessage">
+				<xs:sequence>
+					<xs:element name="xId" type="XId"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!-- See section 6.2.3 -->
+	<xs:complexType name="DeactivateTaskResponse">
+		<xs:complexContent>
+			<xs:extension base="X1ResponseMessage">
+				<xs:sequence>
+					<xs:element name="oK" type="OK"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!-- See section 6.2.4 -->
+	<xs:complexType name="DeactivateAllTasksRequest">
+		<xs:complexContent>
+			<xs:extension base="X1RequestMessage">
+				<xs:sequence/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!-- See section 6.2.4 -->
+	<xs:complexType name="DeactivateAllTasksResponse">
+		<xs:complexContent>
+			<xs:extension base="X1ResponseMessage">
+				<xs:sequence>
+					<xs:element name="oK" type="OK"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!-- See section 6.3.1 -->
+	<xs:complexType name="CreateDestinationRequest">
+		<xs:complexContent>
+			<xs:extension base="X1RequestMessage">
+				<xs:sequence>
+					<xs:element name="destinationDetails" type="DestinationDetails"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!-- See section 6.3.1.2 -->
+	<xs:complexType name="DestinationDetails">
+		<xs:sequence>
+			<xs:element name="dId" type="DId"/>
+			<xs:element name="friendlyName" type="xs:string" minOccurs="0"/>
+			<xs:element name="deliveryType" type="DeliveryType"/>
+			<xs:element name="deliveryAddress" type="DeliveryAddress"/>
+			<xs:element name="destinationDetailsExtensions" type="DestinationDetailsExtensions" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="DeliveryAddress">
+		<xs:choice>
+			<xs:element name="ipAddressAndPort" type="etsi103280:IPAddressPort"/>
+			<xs:element name="e164Number" type="etsi103280:InternationalE164"/>
+			<xs:element name="uri" type="xs:anyURI"/>
+			<xs:element name="emailAddress" type="etsi103280:EmailAddress"/>
+		</xs:choice>
+	</xs:complexType>
+	<xs:complexType name="DestinationDetailsExtensions">
+		<xs:complexContent>
+			<xs:extension base="Extension"/>
+		</xs:complexContent>
+	</xs:complexType>	
+	<!-- See section 6.3.1 -->
+	<xs:complexType name="CreateDestinationResponse">
+		<xs:complexContent>
+			<xs:extension base="X1ResponseMessage">
+				<xs:sequence>
+					<xs:element name="oK" type="OK"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!-- See section 6.3.2 -->
+	<xs:complexType name="ModifyDestinationRequest">
+		<xs:complexContent>
+			<xs:extension base="X1RequestMessage">
+				<xs:sequence>
+					<xs:element name="destinationDetails" type="DestinationDetails"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!-- See section 6.3.2 -->
+	<xs:complexType name="ModifyDestinationResponse">
+		<xs:complexContent>
+			<xs:extension base="X1ResponseMessage">
+				<xs:sequence>
+					<xs:element name="oK" type="OK"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!-- See section 6.3.3 -->
+	<xs:complexType name="RemoveDestinationRequest">
+		<xs:complexContent>
+			<xs:extension base="X1RequestMessage">
+				<xs:sequence>
+					<xs:element name="dId" type="DId"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!-- See section 6.3.3 -->
+	<xs:complexType name="RemoveDestinationResponse">
+		<xs:complexContent>
+			<xs:extension base="X1ResponseMessage">
+				<xs:sequence>
+					<xs:element name="oK" type="OK"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!-- See section 6.3.4 -->
+	<xs:complexType name="RemoveAllDestinationsRequest">
+		<xs:complexContent>
+			<xs:extension base="X1RequestMessage">
+				<xs:sequence/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!-- See section 6.3.4 -->
+	<xs:complexType name="RemoveAllDestinationsResponse">
+		<xs:complexContent>
+			<xs:extension base="X1ResponseMessage">
+				<xs:sequence>
+					<xs:element name="oK" type="OK"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!-- See section 6.4.2 -->
+	<xs:complexType name="GetTaskDetailsRequest">
+		<xs:complexContent>
+			<xs:extension base="X1RequestMessage">
+				<xs:sequence>
+					<xs:element name="xId" type="XId"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!-- See section 6.4.2 -->
+	<xs:complexType name="GetTaskDetailsResponse">
+		<xs:complexContent>
+			<xs:extension base="X1ResponseMessage">
+				<xs:sequence>
+					<xs:element name="taskResponseDetails" type="TaskResponseDetails"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="TaskResponseDetails">
+		<xs:sequence>
+			<xs:element name="taskDetails" type="TaskDetails"/>
+			<xs:element name="taskStatus" type="TaskStatus"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!-- See section 6.4.2.2 -->
+	<xs:complexType name="TaskStatus">
+		<xs:sequence>
+			<xs:element name="provisioningStatus" type="ProvisioningStatus"/>
+			<xs:element name="listOfFaults" type="ListOfFaults"/>
+			<xs:element name="timeOfLastIntercept" type="etsi103280:QualifiedMicrosecondDateTime" minOccurs="0"/>
+			<xs:element name="amountOfX2Data" type="xs:integer" minOccurs="0"/>
+			<xs:element name="amountOfX3Data" type="xs:integer" minOccurs="0"/>
+			<xs:element name="timeOfLastModification" type="etsi103280:QualifiedMicrosecondDateTime" minOccurs="0"/>
+			<xs:element name="numberOfModifications" type="xs:integer" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:simpleType name="ProvisioningStatus">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="awaitingProvisioning"/>
+			<xs:enumeration value="failed"/>
+			<xs:enumeration value="complete"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:complexType name="ListOfFaults">
+		<xs:sequence>
+			<xs:element name="unresolvedFault" type="ErrorInformation" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!-- See section 6.4.3 -->
+	<xs:complexType name="GetDestinationDetailsRequest">
+		<xs:complexContent>
+			<xs:extension base="X1RequestMessage">
+				<xs:sequence>
+					<xs:element name="dId" type="DId"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!-- See section 6.4.3 -->
+	<xs:complexType name="GetDestinationDetailsResponse">
+		<xs:complexContent>
+			<xs:extension base="X1ResponseMessage">
+				<xs:sequence>
+					<xs:element name="destinationResponseDetails" type="DestinationResponseDetails"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="DestinationResponseDetails">
+		<xs:sequence>
+			<xs:element name="destinationDetails" type="DestinationDetails"/>
+			<xs:element name="destinationStatus" type="DestinationStatus"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!-- See section 6.4.3.2 -->
+	<xs:complexType name="DestinationStatus">
+		<xs:sequence>
+			<xs:element name="destinationDeliveryStatus" type="DestinationDeliveryStatus"/>
+			<xs:element name="listOfFaults" type="ListOfFaults"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:simpleType name="DestinationDeliveryStatus">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="activeAndWorking"/>
+			<xs:enumeration value="deliveryFault"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!-- See section 6.4.4 -->
+	<xs:complexType name="GetNEStatusRequest">
+		<xs:complexContent>
+			<xs:extension base="X1RequestMessage">
+				<xs:sequence/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!-- See section 6.4.4 -->
+	<xs:complexType name="GetNEStatusResponse">
+		<xs:complexContent>
+			<xs:extension base="X1ResponseMessage">
+				<xs:sequence>
+					<xs:element name="neStatusDetails" type="NeStatusDetails"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="NeStatusDetails">
+		<xs:sequence>
+			<xs:element name="neStatus" type="NeStatus"/>
+			<xs:element name="listOfFaults" type="ListOfFaults"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:simpleType name="NeStatus">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="OK"/>
+			<xs:enumeration value="Faults"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!-- See section 6.4.5 -->
+	<xs:complexType name="GetAllDetailsRequest">
+		<xs:complexContent>
+			<xs:extension base="X1RequestMessage">
+				<xs:sequence/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!-- See section 6.4.5 -->
+	<xs:complexType name="GetAllDetailsResponse">
+		<xs:complexContent>
+			<xs:extension base="X1ResponseMessage">
+				<xs:sequence>
+					<xs:element name="neStatusDetails" type="NeStatusDetails"/>
+					<xs:element name="listOfTaskResponseDetails" type="ListOfTaskResponseDetails"/>
+					<xs:element name="listOfDestinationResponseDetails" type="ListOfDestinationResponseDetails"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="ListOfTaskResponseDetails">
+		<xs:sequence>
+			<xs:element name="taskResponseDetails" type="TaskResponseDetails" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="ListOfDestinationResponseDetails">
+		<xs:sequence>
+			<xs:element name="destinationResponseDetails" type="DestinationResponseDetails" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!-- See section 6.4.6 -->
+	<xs:complexType name="ListAllDetailsRequest">
+		<xs:complexContent>
+			<xs:extension base="X1RequestMessage">
+				<xs:sequence/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!-- See section 6.4.6 -->
+	<xs:complexType name="ListAllDetailsResponse">
+		<xs:complexContent>
+			<xs:extension base="X1ResponseMessage">
+				<xs:sequence>
+					<xs:element name="ListOfXIDs" type="ListOfXids"/>
+					<xs:element name="ListOfDIDs" type="ListOfDids"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="ListOfXids">
+		<xs:sequence>
+			<xs:element name="xId" type="XId" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!-- See section 6.5.2 -->
+	<xs:complexType name="ReportTaskIssueRequest">
+		<xs:complexContent>
+			<xs:extension base="X1RequestMessage">
+				<xs:sequence>
+					<xs:element name="xId" type="XId"/>
+					<xs:element name="taskReportType" type="TaskReportType"/>
+					<xs:element name="taskIssueErrorCode" type="xs:integer" minOccurs="0"/>
+					<xs:element name="taskIssueDetails" type="xs:string" minOccurs="0"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!-- See section 6.4.2.2 -->
+	<xs:simpleType name="TaskReportType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="AllClear"/>
+			<xs:enumeration value="Warning"/>
+			<xs:enumeration value="NonTerminatingFault"/>
+			<xs:enumeration value="TerminatingFault"/>
+			<xs:enumeration value="ImplicitDeactivation"/>
+			<xs:enumeration value="FullyActionedAndSuccessful"/>
+			<xs:enumeration value="FullyActionedAndUnsuccessful"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!-- See section 6.5.2 -->
+	<xs:complexType name="ReportTaskIssueResponse">
+		<xs:complexContent>
+			<xs:extension base="X1ResponseMessage">
+				<xs:sequence>
+					<xs:element name="oK" type="OK"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!-- See section 6.5.3 -->
+	<xs:complexType name="ReportDestinationIssueRequest">
+		<xs:complexContent>
+			<xs:extension base="X1RequestMessage">
+				<xs:sequence>
+					<xs:element name="dId" type="DId"/>
+					<xs:element name="destinationReportType" type="TaskReportType"/>
+					<xs:element name="destinationIssueErrorCode" type="xs:integer" minOccurs="0"/>
+					<xs:element name="destinationIssueDetails" type="xs:string" minOccurs="0"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!-- See section 6.5.3 -->
+	<xs:complexType name="ReportDestinationIssueResponse">
+		<xs:complexContent>
+			<xs:extension base="X1ResponseMessage">
+				<xs:sequence>
+					<xs:element name="oK" type="OK"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!-- See section 6.5.4 -->
+	<xs:complexType name="ReportNEIssueRequest">
+		<xs:complexContent>
+			<xs:extension base="X1RequestMessage">
+				<xs:sequence>
+					<xs:element name="typeOfNeIssueMessage" type="TypeOfNeIssueMessage"/>
+					<xs:element name="description" type="xs:string"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!-- See section 6.5.4 -->
+	<xs:simpleType name="TypeOfNeIssueMessage">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Warning"/>
+			<xs:enumeration value="FaultCleared"/>
+			<xs:enumeration value="FaultReport"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!-- See section 6.5.4 -->
+	<xs:complexType name="ReportNEIssueResponse">
+		<xs:complexContent>
+			<xs:extension base="X1ResponseMessage">
+				<xs:sequence>
+					<xs:element name="oK" type="OKAckAndComplete"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!-- See section 6.6.1 -->
+	<xs:complexType name="PingRequest">
+		<xs:complexContent>
+			<xs:extension base="X1RequestMessage">
+				<xs:sequence/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!-- See section 6.6.1 -->
+	<xs:complexType name="PingResponse">
+		<xs:complexContent>
+			<xs:extension base="X1ResponseMessage">
+				<xs:sequence>
+					<xs:element name="oK" type="OK"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!-- See section 6.6.2 -->
+	<xs:complexType name="KeepaliveRequest">
+		<xs:complexContent>
+			<xs:extension base="X1RequestMessage">
+				<xs:sequence/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!-- See section 6.6.2 -->
+	<xs:complexType name="KeepaliveResponse">
+		<xs:complexContent>
+			<xs:extension base="X1ResponseMessage">
+				<xs:sequence>
+					<xs:element name="oK" type="OK"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+</xs:schema>
diff --git a/103221-1/portal/validate_examples.py b/103221-1/portal/validate_examples.py
new file mode 100644
index 0000000..0faa18a
--- /dev/null
+++ b/103221-1/portal/validate_examples.py
@@ -0,0 +1,93 @@
+import glob
+import sys
+
+
+XS = 'http://www.w3.org/2001/XMLSchema'
+
+
+def validate_example(example, schema):
+
+    print('Validating example {}'.format(example))
+
+    xml = open(example)
+    doc = etree.parse(xml)
+    schema.assertValid(doc)
+
+    print('Validated example {}'.format(example))
+
+
+def validate_examples(schema):
+
+    examples = glob.glob('./examples/*.xml')
+
+    if not examples:
+        sys.exit('ERROR: No examples found in ./examples/ directory')
+
+    for example in examples:
+        validate_example(example, schema)
+
+
+def load_schema(xsd):
+
+    xsd_file = open(xsd)
+
+    xsd_doc = etree.parse(xsd_file)
+
+    # Set schemaLocation of TS 103 280 XSD
+
+    common_xsd = glob.glob('./TS_103_280_*.xsd')
+
+    if not common_xsd:
+        sys.exit('ERROR: Please copy a TS 103 280 XSD into this directory')
+
+    if len(common_xsd) > 1:
+        sys.exit('ERROR: Too many TS 103 280 XSDs in current directory')
+
+    imports = xsd_doc.xpath('//*/xs:import', namespaces={'xs': XS})
+
+    for xsd_import in imports:
+        xsd_import.attrib['schemaLocation'] = common_xsd[0]
+
+    # Load TS 103 221-1 XSD as a schema
+
+    return etree.XMLSchema(xsd_doc)
+
+
+def validate_xsd(xsd):
+
+    print('Validating XSD {}'.format(xsd))
+
+    schema = load_schema(xsd)
+
+    print('Validated XSD {}'.format(xsd))
+    print('')
+
+    validate_examples(schema)
+
+    print('')
+    print('Validated all examples for XSD {}'.format(xsd))
+    print('')
+
+
+def validate_xsds():
+
+    xsds = glob.glob('./TS_103_221_01_*.xsd')
+
+    if not xsds:
+        sys.exit('ERROR: No TS 103 221-1 XSDs found in current directory')
+
+    for xsd in xsds:
+        validate_xsd(xsd)
+
+
+if __name__ == '__main__':
+
+    if sys.version_info <= (3, 5):
+        sys.exit('ERROR: You need at least Python 3.5 to run this tool')
+
+    try:
+        from lxml import etree
+    except ImportError:
+        sys.exit('ERROR: You need to install the Python lxml library')
+
+    validate_xsds()
-- 
GitLab