diff --git a/33128/r15/TS33128Payloads.asn b/33128/r15/TS33128Payloads.asn
index 59e0a0730ab802695401b5dc0026babdd2f916ce..c1d86573b61f5ada447682db412dce586b42b744 100644
--- a/33128/r15/TS33128Payloads.asn
+++ b/33128/r15/TS33128Payloads.asn
@@ -1,5 +1,5 @@
 TS33128Payloads
-{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r15(15) version6(6)}
+{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r15(15) version7(7)}
 
 DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::=
 
@@ -9,13 +9,13 @@ BEGIN
 -- Relative OIDs
 -- =============
 
-xIRIPayloadOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r15(15) version6(6) xIRI(1)}
-xCCPayloadOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r15(15) version6(6) xCC(2)}
+xIRIPayloadOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r15(15) version7(7) xIRI(1)}
+xCCPayloadOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r15(15) version7(7) xCC(2)}
 
-iRIPayloadOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r15(15) version6(6) iRI(3)}
-cCPayloadOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r15(15) version6(6) cC(4)}
+iRIPayloadOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r15(15) version7(7) iRI(3)}
+cCPayloadOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r15(15) version7(7) cC(4)}
 
-lINotificationPayloadOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r15(15) version6(6) lINotification(5)}
+lINotificationPayloadOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r15(15) version7(7) lINotification(5)}
 
 -- ===============
 -- X2 xIRI payload
@@ -69,9 +69,10 @@ XIRIEvent ::= CHOICE
 
 IRIPayload ::= SEQUENCE
 {
-    relativeOID         [1] RELATIVE-OID,
-    event               [2] IRIEvent,
-    targetIdentifiers   [3] SEQUENCE OF IRITargetIdentifier OPTIONAL
+    relativeOID              [1] RELATIVE-OID,
+    event                    [2] IRIEvent,
+    targetIdentifiers        [3] SEQUENCE OF IRITargetIdentifier OPTIONAL,
+    mediatedFromIndicator    [4] MediatedFromIndicator OPTIONAL
 }
 
 IRIEvent ::= CHOICE
@@ -113,6 +114,11 @@ IRITargetIdentifier ::= SEQUENCE
     provenance                                          [2] TargetIdentifierProvenance OPTIONAL
 }
 
+MediatedFromIndicator ::= CHOICE
+{
+    xIRIRelativeOID   [1] RELATIVE-OID
+}
+
 -- ==============
 -- HI3 CC payload
 -- ==============
diff --git a/33128/r16/TS33128Payloads.asn b/33128/r16/TS33128Payloads.asn
index 4f019253a0ffe3dc55df049902ca6ba9134381cb..5efb899f427c3c2cdfe96e6d1e01d62a78e9eaef 100644
--- a/33128/r16/TS33128Payloads.asn
+++ b/33128/r16/TS33128Payloads.asn
@@ -1,5 +1,5 @@
 TS33128Payloads
-{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r16(16) version14(14)}
+{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r16(16) version15(15)}
 
 DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::=
 
@@ -9,7 +9,7 @@ BEGIN
 -- Relative OIDs
 -- =============
 
-tS33128PayloadsOID          RELATIVE-OID ::= {threeGPP(4) ts33128(19) r16(16) version14(14)}
+tS33128PayloadsOID          RELATIVE-OID ::= {threeGPP(4) ts33128(19) r16(16) version15(15)}
 
 xIRIPayloadOID              RELATIVE-OID ::= {tS33128PayloadsOID xIRI(1)}
 xCCPayloadOID               RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)}
@@ -133,9 +133,10 @@ XIRIEvent ::= CHOICE
 
 IRIPayload ::= SEQUENCE
 {
-    iRIPayloadOID       [1] RELATIVE-OID,
-    event               [2] IRIEvent,
-    targetIdentifiers   [3] SEQUENCE OF IRITargetIdentifier OPTIONAL
+    iRIPayloadOID          [1] RELATIVE-OID,
+    event                  [2] IRIEvent,
+    targetIdentifiers      [3] SEQUENCE OF IRITargetIdentifier OPTIONAL,
+    mediatedFromIndicator  [4] MediatedFromIndicator OPTIONAL
 }
 
 IRIEvent ::= CHOICE
@@ -239,6 +240,11 @@ IRITargetIdentifier ::= SEQUENCE
     provenance                                          [2] TargetIdentifierProvenance OPTIONAL
 }
 
+MediatedFromIndicator ::= CHOICE
+{
+    xIRIRelativeOID   [1] RELATIVE-OID
+}
+
 -- ==============
 -- HI3 CC payload
 -- ==============
diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn
index e4dd004defd16fb2c548a8a056d214ec50ee6b5a..743002f983ff7904fcb1bb804c142b6f25870193 100644
--- a/33128/r17/TS33128Payloads.asn
+++ b/33128/r17/TS33128Payloads.asn
@@ -1,5 +1,5 @@
 TS33128Payloads
-{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r17(17) version10(10)}
+{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r17(17) version11(11)}
 
 DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::=
 
@@ -9,7 +9,7 @@ BEGIN
 -- Relative OIDs
 -- =============
 
-tS33128PayloadsOID          RELATIVE-OID ::= {threeGPP(4) ts33128(19) r17(17) version10(10)}
+tS33128PayloadsOID          RELATIVE-OID ::= {threeGPP(4) ts33128(19) r17(17) version11(11)}
 
 xIRIPayloadOID              RELATIVE-OID ::= {tS33128PayloadsOID xIRI(1)}
 xCCPayloadOID               RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)}
@@ -210,9 +210,10 @@ XIRIEvent ::= CHOICE
 
 IRIPayload ::= SEQUENCE
 {
-    iRIPayloadOID       [1] RELATIVE-OID,
-    event               [2] IRIEvent,
-    targetIdentifiers   [3] SEQUENCE OF IRITargetIdentifier OPTIONAL
+    iRIPayloadOID         [1] RELATIVE-OID,
+    event                 [2] IRIEvent,
+    targetIdentifiers     [3] SEQUENCE OF IRITargetIdentifier OPTIONAL,
+    mediatedFromIndicator [4] MediatedFromIndicator OPTIONAL
 }
 
 IRIEvent ::= CHOICE
@@ -392,6 +393,11 @@ IRITargetIdentifier ::= SEQUENCE
     provenance                                          [2] TargetIdentifierProvenance OPTIONAL
 }
 
+MediatedFromIndicator ::= CHOICE
+{
+    xIRIRelativeOID   [1] RELATIVE-OID
+}
+
 -- ==============
 -- HI3 CC payload
 -- ==============
diff --git a/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd b/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd
index 5f29b559f82dd822e3f513a351df03ab15f9c662..0ffbc40bde460d1f8d737ce57b2196b42466ecfc 100644
--- a/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd
+++ b/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           xmlns="urn:3GPP:ns:li:3GPPX1Extensions:r17:v4"
+           xmlns="urn:3GPP:ns:li:3GPPX1Extensions:r17:v5"
            xmlns:common="http://uri.etsi.org/03280/common/2017/07"
-           targetNamespace="urn:3GPP:ns:li:3GPPX1Extensions:r17:v4"
+           targetNamespace="urn:3GPP:ns:li:3GPPX1Extensions:r17:v5"
            elementFormDefault="qualified">
 
   <xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>
@@ -244,6 +244,8 @@
 
   <xs:element name="HR" type="EmptyElement"></xs:element>
   <xs:element name="IMSSignaling" type="EmptyElement"></xs:element>
+  <xs:element name="APN" type="common:ShortString"></xs:element>
+  <xs:element name="DNN" type="common:ShortString"></xs:element>
 
   <xs:element name="HRLIT1TargetIdentifierExtensions" type="HRLIT1TargetIdentifierExtensions"></xs:element>
 
diff --git a/33128/r18/TS33128Dictionaries.xml b/33128/r18/TS33128Dictionaries.xml
index 948c9e5d22ef6727ad3d268f64d1b1218c25712a..367c1eecd9e47d4ae9169dd631c44b50a22a9f33 100644
--- a/33128/r18/TS33128Dictionaries.xml
+++ b/33128/r18/TS33128Dictionaries.xml
@@ -54,11 +54,11 @@
             </DictionaryEntry>
             <DictionaryEntry>
                 <Value>OngoingIdentityAssociation</Value>
-                <Meaning>A request for location information of the target, consisting at least of the TAI and the NCGI.</Meaning>
+                <Meaning>A request for an ongoing series of IdentityResponseDetails responses matching the query provided.</Meaning>
             </DictionaryEntry>
             <DictionaryEntry>
                 <Value>LocationAcquisition</Value>
-                <Meaning>A request for an ongoing series of IdentityResponseDetails responses matching the query provided.</Meaning>
+                <Meaning>A request for location information of the target, consisting at least of the TAI and the NCGI.</Meaning>
             </DictionaryEntry>
         </DictionaryEntries>
     </Dictionary>
@@ -68,7 +68,7 @@
         <DictionaryEntries>
             <DictionaryEntry>
                 <Value>IncludeNCGIInResponse</Value>
-                <Meaning>A request for returning the NCGI in the response.</Meaning>
+                <Meaning>A request for returning the NCGI and additional CGIs in the response.</Meaning>
             </DictionaryEntry>
         </DictionaryEntries>
     </Dictionary>
diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn
index 3c66b8de17eda334c41d996c8d2229a001d4d82c..f0609a5e30fd63fd21172ab4be977ca0db22a7a7 100644
--- a/33128/r18/TS33128Payloads.asn
+++ b/33128/r18/TS33128Payloads.asn
@@ -1,5 +1,5 @@
 TS33128Payloads
-{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r18(18) version7(7)}
+{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r18(18) version8(8)}
 
 DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::=
 
@@ -9,7 +9,7 @@ BEGIN
 -- Relative OIDs
 -- =============
 
-tS33128PayloadsOID          RELATIVE-OID ::= {threeGPP(4) ts33128(19) r18(18) version7(7)}
+tS33128PayloadsOID          RELATIVE-OID ::= {threeGPP(4) ts33128(19) r18(18) version8(8)}
 
 xIRIPayloadOID              RELATIVE-OID ::= {tS33128PayloadsOID xIRI(1)}
 xCCPayloadOID               RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)}
@@ -281,9 +281,10 @@ XIRIEvent ::= CHOICE
 
 IRIPayload ::= SEQUENCE
 {
-    iRIPayloadOID       [1] RELATIVE-OID,
-    event               [2] IRIEvent,
-    targetIdentifiers   [3] SEQUENCE OF IRITargetIdentifier OPTIONAL
+    iRIPayloadOID          [1] RELATIVE-OID,
+    event                  [2] IRIEvent,
+    targetIdentifiers      [3] SEQUENCE OF IRITargetIdentifier OPTIONAL,
+    mediatedFromIndicator  [4] MediatedFromIndicator OPTIONAL
 }
 
 IRIEvent ::= CHOICE
@@ -534,6 +535,11 @@ IRITargetIdentifier ::= SEQUENCE
     provenance                                          [2] TargetIdentifierProvenance OPTIONAL
 }
 
+MediatedFromIndicator ::= CHOICE
+{
+    xIRIRelativeOID [1] RELATIVE-OID
+}
+
 -- ==============
 -- HI3 CC payload
 -- ==============
@@ -3184,12 +3190,17 @@ SMSRPMessageReference ::= INTEGER (0..255)
 
 SMSTPDUData ::= CHOICE
 {
-    sMSTPDU [1] SMSTPDU,
-    truncatedSMSTPDU [2] TruncatedSMSTPDU
+    sMSTPDU              [1] SMSTPDU,
+    truncatedSMSTPDU     [2] TruncatedSMSTPDU,
+    redactedSMSTPDU      [3] SMSTPDU,
+    threeGPP2SMSTPDU     [4] ThreeGPP2SMSTPDU,
+    redacted3GPP2SMSTPDU [5] ThreeGPP2SMSTPDU
 }
 
 SMSTPDU ::= OCTET STRING (SIZE(1..270))
 
+ThreeGPP2SMSTPDU ::= OCTET STRING
+
 TruncatedSMSTPDU ::= OCTET STRING (SIZE(1..130))
 
 -- ===============
@@ -6544,7 +6555,9 @@ NRLocation ::= SEQUENCE
     geodeticInformation         [6] UTF8String OPTIONAL,
     globalGNbID                 [7] GlobalRANNodeID OPTIONAL,
     cellSiteInformation         [8] CellSiteInformation OPTIONAL,
-    ignoreNCGI                  [9] BOOLEAN OPTIONAL
+    ignoreNCGI                  [9] BOOLEAN OPTIONAL,
+    nRNTNTAIInfo                [10] NRNTNTAIInfo OPTIONAL,
+    iABMTUserLocation           [11] IABMTUserLocation OPTIONAL
 }
 
 -- TS 29.571 [17], clause 5.4.4.10
@@ -7395,6 +7408,21 @@ SIPCellularNetworkInformation ::= SEQUENCE
     servingPLMN          [2] PLMNID OPTIONAL
 }
 
+-- TS 29.571 [17], clause 5.4.4.9 and TS 38.413 [23] clause 9.3.3.53
+NRNTNTAIInfo ::= SEQUENCE
+{
+    servingPLMN                   [1] PLMNID,
+    tACListNRNTN                  [2] SEQUENCE (SIZE(1..MAX)) OF TAC,
+    uELocationDerivedNTNTAC       [3] TAC OPTIONAL
+}
+
+-- TS 38.413 [23], clause 9.3.1.260
+IABMTUserLocation ::= SEQUENCE
+{
+    nRCGI             [1] NCGI,
+    tAI               [2] TAI OPTIONAL
+}
+
 -- ==================================================
 -- Structures to allow reuse of encapsulated payloads
 -- ==================================================
@@ -7444,7 +7472,8 @@ PredefinedPayloadModification ::= ENUMERATED
     rCSTextContentRemoval(11),
     rCSSubjectContentRemoval(12),
     rCSGeolocationPUSHContentRemoval(13),
-    rCSFileURLContentRemoval(14)
+    rCSFileURLContentRemoval(14),
+    threeGPP2SMSUserDataRedaction(15)
 }
 
 PayloadModificationDescription ::= SEQUENCE
diff --git a/33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd b/33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd
index 347ad78207f46d42dd098cf7068a0c9132124c19..7d540b6da997e390a73ec9e1ad03599aa87130f1 100644
--- a/33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd
+++ b/33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="urn:3GPP:ns:li:3GPPIdentityExtensions:r18:v2" xmlns:x1="http://uri.etsi.org/03221/X1/2017/10" xmlns:common="http://uri.etsi.org/03280/common/2017/07" xmlns:liqr="urn:3GPP:ns:li:3GPPLIQueryExtensions:r18:v3" targetNamespace="urn:3GPP:ns:li:3GPPIdentityExtensions:r18:v2" elementFormDefault="qualified">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="urn:3GPP:ns:li:3GPPIdentityExtensions:r18:v3" xmlns:x1="http://uri.etsi.org/03221/X1/2017/10" xmlns:common="http://uri.etsi.org/03280/common/2017/07" xmlns:liqr="urn:3GPP:ns:li:3GPPLIQueryExtensions:r18:v4" targetNamespace="urn:3GPP:ns:li:3GPPIdentityExtensions:r18:v3" elementFormDefault="qualified">
 
   <xs:import namespace="http://uri.etsi.org/03221/X1/2017/10"/>
   <xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>
-  <xs:import namespace="urn:3GPP:ns:li:3GPPLIQueryExtensions:r18:v3"/>
+  <xs:import namespace="urn:3GPP:ns:li:3GPPLIQueryExtensions:r18:v4"/>
 
   <xs:complexType name="IdentityAssociationRequest">
     <xs:complexContent>
@@ -46,6 +46,7 @@
       <xs:element name="FiveGSTAIList" type="liqr:FiveGSTAIList" minOccurs="0"/>
       <xs:element name="GPSI" type="liqr:GPSI" minOccurs="0"/>
       <xs:element name="NCGI" type="liqr:NCGI" minOccurs="0"/>
+      <xs:element name="AdditionalCGIs" type="liqr:AdditionalCGIList" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
diff --git a/33128/r18/urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd b/33128/r18/urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd
index e8049e8f110359eb33a5b719843491f31a12456c..0facb4f53eba8f17e05063d1cd4364fe94ff4648 100644
--- a/33128/r18/urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd
+++ b/33128/r18/urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd
@@ -1,182 +1,202 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="urn:3GPP:ns:li:3GPPLIQueryExtensions:r18:v3" xmlns:x1="http://uri.etsi.org/03221/X1/2017/10" xmlns:common="http://uri.etsi.org/03280/common/2017/07" xmlns:etsi103120common="http://uri.etsi.org/03120/common/2016/02/Common" targetNamespace="urn:3GPP:ns:li:3GPPLIQueryExtensions:r18:v3" elementFormDefault="qualified">
-
-  <xs:import namespace="http://uri.etsi.org/03221/X1/2017/10"/>
-  <xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>
-  <xs:import namespace="http://uri.etsi.org/03120/common/2016/02/Common"/>
-
-  <xs:complexType name="LIQueryRequest">
-    <xs:complexContent>
-      <xs:extension base="x1:X1RequestMessage">
-        <xs:sequence>
-          <xs:element name="RequestDetails" type="RequestDetails"/>
-          <xs:element name="Flags" type="TaskFlags"/>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name="RequestDetails">
-    <xs:sequence>
-      <xs:element name="Type" type="DictionaryEntry"/>
-      <xs:element name="ObservedTime" type="common:QualifiedDateTime"/>
-      <xs:element name="RequestValues" type="RequestValues"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="TaskFlags">
-    <xs:sequence>
-      <xs:element name="TaskFlag" type="etsi103120common:DictionaryEntry" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="RequestValues">
-    <xs:sequence>
-      <xs:element name="RequestValue" type="RequestValue" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="RequestValue">
-    <xs:sequence>
-      <xs:element name="FormatType" type="FormatType"/>
-      <xs:element name="Value" type="common:LongString"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="FormatType">
-    <xs:sequence>
-      <xs:element name="FormatOwner" type="common:ShortString"/>
-      <xs:element name="FormatName" type="common:ShortString"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="ErrorResponse">
-    <xs:complexContent>
-      <xs:extension base="x1:X1ResponseMessage">
-        <xs:sequence>
-          <xs:element name="errorInformation" type="ErrorInformation"/>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name="ErrorInformation">
-    <xs:sequence>
-      <xs:element name="errorCode" type="xs:integer" minOccurs="0"/>
-      <xs:element name="errorDescription" type="xs:string"/>
-      <xs:element name="errorDetails" type="TS29571ProblemDetails" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="DictionaryEntry">
-    <xs:sequence>
-      <xs:element name="Owner" type="common:ShortString"/>
-      <xs:element name="Name" type="common:ShortString"/>
-      <xs:element name="Value" type="common:ShortString"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="SUPI">
-    <xs:choice>
-      <xs:element name="SUPIIMSI" type="common:SUPIIMSI"/>
-      <xs:element name="SUPINAI" type="common:SUPINAI"/>
-    </xs:choice>
-  </xs:complexType>
-
-  <xs:simpleType name="SUCI">
-    <xs:restriction base="xs:string"/>
-  </xs:simpleType>
-
-  <xs:simpleType name="FiveGGUTI">
-    <xs:restriction base="xs:string"/>
-  </xs:simpleType>
-
-  <xs:complexType name="PEI">
-    <xs:choice>
-      <xs:element name="PEIIMEI" type="common:PEIIMEI"/>
-      <xs:element name="PEIIMEISV" type="common:PEIIMEISV"/>
-      <xs:element name="PEIMAC" type="common:MACAddress"/>
-    </xs:choice>
-  </xs:complexType>
-
-  <xs:complexType name="FiveGSTAIList">
-    <xs:sequence>
-      <xs:element name="FiveGSTAI" type="FiveGSTAI" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="FiveGSTAI">
-    <xs:sequence>
-      <xs:element name="MCC" type="MCC"/>
-      <xs:element name="MNC" type="MNC"/>
-      <xs:element name="TAC" type="TAC"/>
-      <xs:element name="NID" type="NID" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="GPSI">
-    <xs:choice>
-      <xs:element name="GPSIMSISDN" type="common:GPSIMSISDN"/>
-      <xs:element name="GPSINAI" type="common:GPSINAI"/>
-    </xs:choice>
-  </xs:complexType>
-
-  <xs:simpleType name="MCC">
-    <xs:restriction base="xs:string">
-      <xs:pattern value="[0-9]{3}"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="MNC">
-    <xs:restriction base="xs:string">
-      <xs:pattern value="[0-9]{2,3}"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="TAC">
-    <xs:restriction base="xs:string">
-      <xs:pattern value="([A-Fa-f0-9]{2}){2,3}"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="NID">
-    <xs:restriction base="xs:string">
-      <xs:pattern value="[A-Fa-f0-9]{11}"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="TS29571ProblemDetails">
-    <xs:restriction base="xs:base64Binary"/>
-  </xs:simpleType>
-
-  <xs:simpleType name="TS29518Location">
-    <xs:restriction base="xs:base64Binary"/>
-  </xs:simpleType>
-
-  <xs:simpleType name="TS29272Location">
-    <xs:restriction base="xs:base64Binary"/>
-  </xs:simpleType>
-
-  <xs:complexType name="NCGI">
-    <xs:sequence>
-      <xs:element name="PLMNID" type="PLMNID"/>
-      <xs:element name="NRCellID" type="NRCellID"/>
-      <xs:element name="NID" type="NID" minOccurs="0"/>
-      <xs:element name="NCGITime" type="common:QualifiedMicrosecondDateTime"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="PLMNID">
-    <xs:sequence>
-      <xs:element name="MCC" type="MCC"/>
-      <xs:element name="MNC" type="MNC"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:simpleType name="NRCellID">
-    <xs:restriction base="xs:string">
-      <xs:pattern value="([A-Fa-f0-9]{9})"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-</xs:schema>
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="urn:3GPP:ns:li:3GPPLIQueryExtensions:r18:v4" xmlns:x1="http://uri.etsi.org/03221/X1/2017/10" xmlns:common="http://uri.etsi.org/03280/common/2017/07" xmlns:etsi103120common="http://uri.etsi.org/03120/common/2016/02/Common" targetNamespace="urn:3GPP:ns:li:3GPPLIQueryExtensions:r18:v4" elementFormDefault="qualified">
+
+  <xs:import namespace="http://uri.etsi.org/03221/X1/2017/10"/>
+  <xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>
+  <xs:import namespace="http://uri.etsi.org/03120/common/2016/02/Common"/>
+
+  <xs:complexType name="LIQueryRequest">
+    <xs:complexContent>
+      <xs:extension base="x1:X1RequestMessage">
+        <xs:sequence>
+          <xs:element name="RequestDetails" type="RequestDetails"/>
+          <xs:element name="Flags" type="TaskFlags"/>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:complexType name="RequestDetails">
+    <xs:sequence>
+      <xs:element name="Type" type="DictionaryEntry"/>
+      <xs:element name="ObservedTime" type="common:QualifiedDateTime"/>
+      <xs:element name="RequestValues" type="RequestValues"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="TaskFlags">
+    <xs:sequence>
+      <xs:element name="TaskFlag" type="etsi103120common:DictionaryEntry" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="RequestValues">
+    <xs:sequence>
+      <xs:element name="RequestValue" type="RequestValue" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="RequestValue">
+    <xs:sequence>
+      <xs:element name="FormatType" type="FormatType"/>
+      <xs:element name="Value" type="common:LongString"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="FormatType">
+    <xs:sequence>
+      <xs:element name="FormatOwner" type="common:ShortString"/>
+      <xs:element name="FormatName" type="common:ShortString"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="ErrorResponse">
+    <xs:complexContent>
+      <xs:extension base="x1:X1ResponseMessage">
+        <xs:sequence>
+          <xs:element name="errorInformation" type="ErrorInformation"/>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:complexType name="ErrorInformation">
+    <xs:sequence>
+      <xs:element name="errorCode" type="xs:integer" minOccurs="0"/>
+      <xs:element name="errorDescription" type="xs:string"/>
+      <xs:element name="errorDetails" type="TS29571ProblemDetails" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="DictionaryEntry">
+    <xs:sequence>
+      <xs:element name="Owner" type="common:ShortString"/>
+      <xs:element name="Name" type="common:ShortString"/>
+      <xs:element name="Value" type="common:ShortString"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="SUPI">
+    <xs:choice>
+      <xs:element name="SUPIIMSI" type="common:SUPIIMSI"/>
+      <xs:element name="SUPINAI" type="common:SUPINAI"/>
+    </xs:choice>
+  </xs:complexType>
+
+  <xs:simpleType name="SUCI">
+    <xs:restriction base="xs:string"/>
+  </xs:simpleType>
+
+  <xs:simpleType name="FiveGGUTI">
+    <xs:restriction base="xs:string"/>
+  </xs:simpleType>
+
+  <xs:complexType name="PEI">
+    <xs:choice>
+      <xs:element name="PEIIMEI" type="common:PEIIMEI"/>
+      <xs:element name="PEIIMEISV" type="common:PEIIMEISV"/>
+      <xs:element name="PEIMAC" type="common:MACAddress"/>
+    </xs:choice>
+  </xs:complexType>
+
+  <xs:complexType name="FiveGSTAIList">
+    <xs:sequence>
+      <xs:element name="FiveGSTAI" type="FiveGSTAI" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="FiveGSTAI">
+    <xs:sequence>
+      <xs:element name="MCC" type="MCC"/>
+      <xs:element name="MNC" type="MNC"/>
+      <xs:element name="TAC" type="TAC"/>
+      <xs:element name="NID" type="NID" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="GPSI">
+    <xs:choice>
+      <xs:element name="GPSIMSISDN" type="common:GPSIMSISDN"/>
+      <xs:element name="GPSINAI" type="common:GPSINAI"/>
+    </xs:choice>
+  </xs:complexType>
+
+  <xs:simpleType name="MCC">
+    <xs:restriction base="xs:string">
+      <xs:pattern value="[0-9]{3}"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="MNC">
+    <xs:restriction base="xs:string">
+      <xs:pattern value="[0-9]{2,3}"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="TAC">
+    <xs:restriction base="xs:string">
+      <xs:pattern value="([A-Fa-f0-9]{2}){2,3}"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="NID">
+    <xs:restriction base="xs:string">
+      <xs:pattern value="[A-Fa-f0-9]{11}"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="TS29571ProblemDetails">
+    <xs:restriction base="xs:base64Binary"/>
+  </xs:simpleType>
+
+  <xs:simpleType name="TS29518Location">
+    <xs:restriction base="xs:base64Binary"/>
+  </xs:simpleType>
+
+  <xs:simpleType name="TS29272Location">
+    <xs:restriction base="xs:base64Binary"/>
+  </xs:simpleType>
+
+  <xs:complexType name="NCGI">
+    <xs:sequence>
+      <xs:element name="PLMNID" type="PLMNID"/>
+      <xs:element name="NRCellID" type="NRCellID"/>
+      <xs:element name="NID" type="NID" minOccurs="0"/>
+      <xs:element name="NCGITime" type="common:QualifiedMicrosecondDateTime"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="PLMNID">
+    <xs:sequence>
+      <xs:element name="MCC" type="MCC"/>
+      <xs:element name="MNC" type="MNC"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:simpleType name="NRCellID">
+    <xs:restriction base="xs:string">
+      <xs:pattern value="([A-Fa-f0-9]{9})"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:complexType name="AdditionalCGIList">
+    <xs:sequence>
+      <xs:element name="AdditionalCGI" type="AdditionalCGI" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="AdditionalCGI">
+    <xs:choice>
+      <xs:element name="NCGIWithoutAssociationTime" type="NCGIWithoutAssociationTime"/>
+    </xs:choice>
+  </xs:complexType>
+
+  <xs:complexType name="NCGIWithoutAssociationTime">
+    <xs:sequence>
+      <xs:element name="PLMNID" type="PLMNID"/>
+      <xs:element name="NRCellID" type="NRCellID"/>
+      <xs:element name="NID" type="NID" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+</xs:schema>
diff --git a/33128/r18/urn_3GPP_ns_li_3GPPX1Extensions.xsd b/33128/r18/urn_3GPP_ns_li_3GPPX1Extensions.xsd
index 812c8b6dfc6cabc044a1c4b6a94b4a2497710a75..20a5a1d11e6dc97296146a5c0e3b16f665c33efe 100644
--- a/33128/r18/urn_3GPP_ns_li_3GPPX1Extensions.xsd
+++ b/33128/r18/urn_3GPP_ns_li_3GPPX1Extensions.xsd
@@ -1,402 +1,404 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="urn:3GPP:ns:li:3GPPX1Extensions:r18:v4" xmlns:common="http://uri.etsi.org/03280/common/2017/07" xmlns:x1="http://uri.etsi.org/03221/X1/2017/10" targetNamespace="urn:3GPP:ns:li:3GPPX1Extensions:r18:v4" elementFormDefault="qualified">
-
-  <xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>
-  <xs:import namespace="http://uri.etsi.org/03221/X1/2017/10"/>
-
-  <xs:element name="X1Extensions" type="X1Extension"/>
-
-  <xs:element name="PTCLIX1TargetIdentifierExtensions" type="PTCLIX1TargetIdentifierExtensions"/>
-  <xs:complexType name="PTCLIX1TargetIdentifierExtensions">
-    <xs:sequence>
-      <xs:element name="PTCLIX1TargetIdentifier" type="PTCLIX1TargetIdentifier" minOccurs="1" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="PTCLIX1TargetIdentifier">
-    <xs:choice>
-      <xs:element name="MCPTTID" type="MCPTTID"/>
-      <xs:element name="InstanceIdentifierURN" type="InstanceIdentifierURN"/>
-      <xs:element name="PTCChatGroupID" type="PTCChatGroupID"/>
-    </xs:choice>
-  </xs:complexType>
-
-  <xs:simpleType name="MCPTTID">
-    <xs:restriction base="xs:anyURI"/>
-  </xs:simpleType>
-
-  <xs:simpleType name="InstanceIdentifierURN">
-    <xs:restriction base="xs:anyURI"/>
-  </xs:simpleType>
-
-  <xs:simpleType name="PTCChatGroupID">
-    <xs:restriction base="xs:anyURI"/>
-  </xs:simpleType>
-
-  <xs:element name="ECX1TargetIdentifierExtensions" type="ECX1TargetIdentifierExtensions"/>
-  <xs:complexType name="ECX1TargetIdentifierExtensions">
-    <xs:sequence>
-      <xs:element name="EECID" type="EECID"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:simpleType name="EECID">
-    <xs:restriction base="xs:string"/>
-  </xs:simpleType>
-
-  <xs:element name="UPFLIT3TargetIdentifierExtensions" type="UPFLIT3TargetIdentifierExtensions"/>
-  <xs:complexType name="UPFLIT3TargetIdentifierExtensions">
-    <xs:sequence>
-      <xs:element name="UPFLIT3TargetIdentifier" type="UPFLIT3TargetIdentifier" minOccurs="1" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="UPFLIT3TargetIdentifier">
-    <xs:choice>
-      <xs:element name="FSEID" type="FSEID"/>
-      <xs:element name="PDRID" type="xs:unsignedInt"/>
-      <xs:element name="QERID" type="xs:unsignedInt"/>
-      <xs:element name="NetworkInstance" type="xs:hexBinary"/>
-      <xs:element name="GTPTunnelDirection" type="GTPTunnelDirection"/>
-      <xs:element name="FTEID" type="FTEID"/>
-    </xs:choice>
-  </xs:complexType>
-
-  <xs:complexType name="FSEID">
-    <xs:sequence>
-      <xs:element name="SEID" type="xs:unsignedLong"/>
-      <xs:element name="IPv4Address" type="common:IPv4Address" minOccurs="0"/>
-      <xs:element name="IPv6Address" type="common:IPv6Address" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="FTEID">
-    <xs:sequence>
-      <xs:element name="TEID" type="xs:unsignedInt"/>
-      <xs:element name="IPv4Address" type="common:IPv4Address" minOccurs="0"/>
-      <xs:element name="IPv6Address" type="common:IPv6Address" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:simpleType name="GTPTunnelDirection">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="Outbound"/>
-      <xs:enumeration value="Inbound"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:element name="IdentifierAssociationExtensions" type="IdentifierAssociationExtensions"/>
-
-  <xs:complexType name="X1Extension">
-    <xs:choice>
-      <xs:element name="LALSLILCSTargetProvisioning" type="LALSLILCSTargetProvisioningExtensions"/>
-      <xs:element name="LALSLTFProvisioning" type="LALSLTFProvisioningExtensions"/>
-      <xs:element name="HeaderReporting" type="PDHRReportingExtensions"/>
-      <xs:element name="SMSFExtensions" type="SMSFProvisioningExtensions"/>
-      <xs:element name="IdentifierAssociation" type="IdentifierAssociationExtensions"/>
-      <xs:element name="SDP" type="SDP"/>
-      <xs:element name="STIRSHAKENProvisioning" type="STIRSHAKENTargetProvisioningExtensions"/>
-      <xs:element name="LocationOnlyProvisioning" type="LocationOnlyProvisioningExtensions"/>
-    </xs:choice>
-  </xs:complexType>
-
-  <xs:complexType name="LALSLILCSTargetProvisioningExtensions">
-    <xs:sequence>
-      <xs:element name="PositioningServiceType" type="PositioningServiceType"/>
-      <xs:element name="PositioningPeriodicity" type="PositioningPeriodicity" minOccurs="0"/>
-      <xs:element name="PositioningParameters" type="PositioningParameters" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:simpleType name="PositioningServiceType">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="Immediate"/>
-      <xs:enumeration value="Periodic"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="PositioningPeriodicity">
-    <xs:restriction base="xs:nonNegativeInteger">
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:complexType name="PositioningParameters">
-    <xs:sequence>
-      <xs:element name="RequestedLocationType" type="RequestedLocationType" minOccurs="0"/>
-      <xs:element name="RequestedResponseType" type="RequestedResponseType" minOccurs="0"/>
-      <xs:element name="MaxLocationAge" type="xs:nonNegativeInteger" minOccurs="0"/>
-      <xs:element name="ResponseTimingRequired" type="ResponseTimingRequired" minOccurs="0"/>
-      <xs:element name="ResponseTimer" type="xs:nonNegativeInteger" minOccurs="0"/>
-      <xs:element name="HorizontalAccuracy" type="NumberWithQOSClass" minOccurs="0"/>
-      <xs:element name="AltitudeAccuracy" type="NumberWithQOSClass" minOccurs="0"/>
-      <xs:element name="MotionStateRequest" type="EmptyElement" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:simpleType name="RequestedLocationType">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="CURRENT"/>
-      <xs:enumeration value="CURRENT_OR_LAST"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="RequestedResponseType">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="SYNC"/>
-      <xs:enumeration value="ASYNC"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="ResponseTimingRequired">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="NO_DELAY"/>
-      <xs:enumeration value="LOW_DELAY"/>
-      <xs:enumeration value="DELAY_TOL"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:complexType name="NumberWithQOSClass">
-    <xs:simpleContent>
-      <xs:extension base="xs:nonNegativeInteger">
-        <xs:attribute name="qos_class" type="QOSClass"/>
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:simpleType name="QOSClass">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="ASSURED"/>
-      <xs:enumeration value="BEST_EFFORT"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="EmptyElement">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value=""/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:complexType name="LALSLTFProvisioningExtensions">
-    <xs:sequence>
-      <xs:element name="LILCSClientAddress" type="LILCSClientIPAddress"/>
-      <xs:element name="PositioningParameters" type="PositioningParameters" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="LILCSClientIPAddress">
-    <xs:sequence>
-      <xs:choice>
-        <xs:element name="IPv4Address" type="common:IPv4Address"/>
-        <xs:element name="IPv6Address" type="common:IPv6Address"/>
-      </xs:choice>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="PDHRReportingExtensions">
-    <xs:sequence>
-      <xs:element name="PDHType" type="PDHType"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="PDHType">
-    <xs:choice>
-      <xs:element name="PDHR" type="EmptyElement"/>
-      <xs:element name="PDSR" type="PDSRParameters"/>
-    </xs:choice>
-  </xs:complexType>
-
-  <xs:complexType name="PDSRParameters">
-    <xs:sequence>
-      <xs:element name="PDSRTriggerType" type="PDSRTriggerType" minOccurs="1" maxOccurs="unbounded"/>
-      <xs:element name="useSessionTriggers" type="xs:boolean" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="PDSRTriggerType">
-    <xs:choice>
-      <xs:element name="TimerExpiry" type="TimerExpiryInSeconds"/>
-      <xs:element name="PacketCount" type="xs:nonNegativeInteger"/>
-      <xs:element name="ByteCount" type="xs:nonNegativeInteger"/>
-    </xs:choice>
-  </xs:complexType>
-
-  <xs:complexType name="SMSFProvisioningExtensions">
-    <xs:sequence>
-      <xs:element name="TruncateTPUserData" type="EmptyElement" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:simpleType name="TimerExpiryInSeconds">
-    <xs:restriction base="xs:nonNegativeInteger">
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:complexType name="IdentifierAssociationExtensions">
-    <xs:sequence>
-      <xs:element name="IdentifierAssociationEventsGenerated" type="IdentifierAssociationEventsGenerated"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:simpleType name="IdentifierAssociationEventsGenerated">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="IdentifierAssociation"/>
-      <xs:enumeration value="All"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:element name="IdentityAssociationTargetIdentifier" type="EmptyElement"/>
-
-  <xs:element name="AKMATargetIdentifier" type="AKMATargetIdentifier"/>
-  <xs:complexType name="AKMATargetIdentifier">
-    <xs:choice>
-      <xs:element name="AKID" type="common:NAI"/>
-    </xs:choice>
-  </xs:complexType>
-
-  <xs:element name="HR" type="EmptyElement"/>
-  <xs:element name="IMSSignaling" type="EmptyElement"/>
-
-  <xs:element name="HRLIT1TargetIdentifierExtensions" type="HRLIT1TargetIdentifierExtensions"/>
-
-  <xs:complexType name="HRLIT1TargetIdentifierExtensions">
-    <xs:sequence>
-      <xs:element name="HRLIT1TargetIdentifier" type="HRLIT1TargetIdentifier" minOccurs="1" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="HRLIT1TargetIdentifier">
-    <xs:choice>
-      <xs:element name="PDUSessionID" type="PDUSessionID"/>
-      <xs:element name="BearerID" type="BearerID"/>
-      <xs:element name="IMSVoiceMedia" type="EmptyElement"/>
-    </xs:choice>
-  </xs:complexType>
-
-  <xs:simpleType name="PDUSessionID">
-    <xs:restriction base="xs:unsignedInt">
-      <xs:minInclusive value="0"/>
-      <xs:maxInclusive value="255"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="BearerID">
-    <xs:restriction base="xs:unsignedInt">
-      <xs:minInclusive value="0"/>
-      <xs:maxInclusive value="255"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:element name="RCSTargetIdentifierExtensions" type="RCSTargetIdentifierExtensions"/>
-
-  <xs:complexType name="RCSTargetIdentifierExtensions">
-    <xs:sequence>
-      <xs:element name="RCSTargetIdentifier" type="RCSTargetIdentifier" minOccurs="1" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="RCSTargetIdentifier">
-    <xs:choice>
-      <xs:element name="RCSContentURI" type="RCSContentURI"/>
-    </xs:choice>
-  </xs:complexType>
-
-  <xs:simpleType name="RCSContentURI">
-    <xs:restriction base="xs:anyURI"/>
-  </xs:simpleType>
-
-  <xs:element name="IMST3TargetIdentifierExtensions" type="IMST3TargetIdentifierExtensions"/>
-
-  <xs:complexType name="IMST3TargetIdentifierExtensions">
-    <xs:sequence>
-      <xs:element name="IMST3TargetIdentifierExtension" type="IMST3TargetIdentifierExtension" minOccurs="1" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="IMST3TargetIdentifierExtension">
-    <xs:choice>
-      <xs:element name="H248ContextID" type="H248ContextID"/>
-      <xs:element name="PayloadDirectionAssignment" type="PayloadDirectionAssignment"/>
-      <xs:element name="TriggerScope" type="TriggerScope"/>
-    </xs:choice>
-  </xs:complexType>
-
-  <xs:simpleType name="PayloadDirectionAssignment">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="ToTarget"/>
-      <xs:enumeration value="FromTarget"/>
-      <xs:enumeration value="NotDetermined"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="H248ContextID">
-    <xs:restriction base="xs:integer">
-      <xs:minInclusive value="1"/>
-      <xs:maxInclusive value="4294967293"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="TriggerScope">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="Unidirectional"/>
-      <xs:enumeration value="Bidirectional"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:complexType name="SDP">
-    <xs:sequence>
-      <xs:element name="SDPData" type="SDPData" minOccurs="1" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="SDPData">
-    <xs:choice>
-      <xs:element name="LocalSDP" type="SDPInfo"/>
-      <xs:element name="RemoteSDP" type="SDPInfo"/>
-    </xs:choice>
-  </xs:complexType>
-
-  <xs:simpleType name="SDPInfo">
-    <xs:restriction base="xs:string">
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:complexType name="STIRSHAKENTargetProvisioningExtensions">
-    <xs:sequence>
-      <xs:element name="ReportDiversionPASSporTInfo" type="ReportDiversionPASSporTInfo"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:simpleType name="ReportDiversionPASSporTInfo">
-    <xs:restriction base="xs:boolean">
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:complexType name="LocationOnlyProvisioningExtensions">
-    <xs:sequence>
-      <xs:element name="LocationOnly" type="EmptyElement" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:element name="DelegatedTaskStatus" type="DelegatedTaskStatus"/>
-
-  <xs:complexType name="DelegatedTaskStatus">
-      <xs:sequence>
-          <xs:element name="ListOfDelegatedTasks" type="ListOfDelegatedTasks"/>
-      </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="ListOfDelegatedTasks">
-      <xs:sequence>
-          <xs:element name="DelegatedTask" type="DelegatedTask" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="DelegatedTask">
-    <xs:sequence>
-        <xs:element name="NEID" type="x1:NeIdentifier"/>
-        <xs:element name="TaskDetails" type="x1:TaskDetails"/>
-        <xs:element name="TaskStatus" type="x1:TaskStatus" minOccurs="0"/>
-        <xs:element name="LastTaskStatusTime" type="common:QualifiedMicrosecondDateTime" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
-</xs:schema>
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="urn:3GPP:ns:li:3GPPX1Extensions:r18:v5" xmlns:common="http://uri.etsi.org/03280/common/2017/07" xmlns:x1="http://uri.etsi.org/03221/X1/2017/10" targetNamespace="urn:3GPP:ns:li:3GPPX1Extensions:r18:v5" elementFormDefault="qualified">
+
+  <xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>
+  <xs:import namespace="http://uri.etsi.org/03221/X1/2017/10"/>
+
+  <xs:element name="X1Extensions" type="X1Extension"/>
+
+  <xs:element name="PTCLIX1TargetIdentifierExtensions" type="PTCLIX1TargetIdentifierExtensions"/>
+  <xs:complexType name="PTCLIX1TargetIdentifierExtensions">
+    <xs:sequence>
+      <xs:element name="PTCLIX1TargetIdentifier" type="PTCLIX1TargetIdentifier" minOccurs="1" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="PTCLIX1TargetIdentifier">
+    <xs:choice>
+      <xs:element name="MCPTTID" type="MCPTTID"/>
+      <xs:element name="InstanceIdentifierURN" type="InstanceIdentifierURN"/>
+      <xs:element name="PTCChatGroupID" type="PTCChatGroupID"/>
+    </xs:choice>
+  </xs:complexType>
+
+  <xs:simpleType name="MCPTTID">
+    <xs:restriction base="xs:anyURI"/>
+  </xs:simpleType>
+
+  <xs:simpleType name="InstanceIdentifierURN">
+    <xs:restriction base="xs:anyURI"/>
+  </xs:simpleType>
+
+  <xs:simpleType name="PTCChatGroupID">
+    <xs:restriction base="xs:anyURI"/>
+  </xs:simpleType>
+
+  <xs:element name="ECX1TargetIdentifierExtensions" type="ECX1TargetIdentifierExtensions"/>
+  <xs:complexType name="ECX1TargetIdentifierExtensions">
+    <xs:sequence>
+      <xs:element name="EECID" type="EECID"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:simpleType name="EECID">
+    <xs:restriction base="xs:string"/>
+  </xs:simpleType>
+
+  <xs:element name="UPFLIT3TargetIdentifierExtensions" type="UPFLIT3TargetIdentifierExtensions"/>
+  <xs:complexType name="UPFLIT3TargetIdentifierExtensions">
+    <xs:sequence>
+      <xs:element name="UPFLIT3TargetIdentifier" type="UPFLIT3TargetIdentifier" minOccurs="1" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="UPFLIT3TargetIdentifier">
+    <xs:choice>
+      <xs:element name="FSEID" type="FSEID"/>
+      <xs:element name="PDRID" type="xs:unsignedInt"/>
+      <xs:element name="QERID" type="xs:unsignedInt"/>
+      <xs:element name="NetworkInstance" type="xs:hexBinary"/>
+      <xs:element name="GTPTunnelDirection" type="GTPTunnelDirection"/>
+      <xs:element name="FTEID" type="FTEID"/>
+    </xs:choice>
+  </xs:complexType>
+
+  <xs:complexType name="FSEID">
+    <xs:sequence>
+      <xs:element name="SEID" type="xs:unsignedLong"/>
+      <xs:element name="IPv4Address" type="common:IPv4Address" minOccurs="0"/>
+      <xs:element name="IPv6Address" type="common:IPv6Address" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="FTEID">
+    <xs:sequence>
+      <xs:element name="TEID" type="xs:unsignedInt"/>
+      <xs:element name="IPv4Address" type="common:IPv4Address" minOccurs="0"/>
+      <xs:element name="IPv6Address" type="common:IPv6Address" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:simpleType name="GTPTunnelDirection">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="Outbound"/>
+      <xs:enumeration value="Inbound"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:element name="IdentifierAssociationExtensions" type="IdentifierAssociationExtensions"/>
+
+  <xs:complexType name="X1Extension">
+    <xs:choice>
+      <xs:element name="LALSLILCSTargetProvisioning" type="LALSLILCSTargetProvisioningExtensions"/>
+      <xs:element name="LALSLTFProvisioning" type="LALSLTFProvisioningExtensions"/>
+      <xs:element name="HeaderReporting" type="PDHRReportingExtensions"/>
+      <xs:element name="SMSFExtensions" type="SMSFProvisioningExtensions"/>
+      <xs:element name="IdentifierAssociation" type="IdentifierAssociationExtensions"/>
+      <xs:element name="SDP" type="SDP"/>
+      <xs:element name="STIRSHAKENProvisioning" type="STIRSHAKENTargetProvisioningExtensions"/>
+      <xs:element name="LocationOnlyProvisioning" type="LocationOnlyProvisioningExtensions"/>
+    </xs:choice>
+  </xs:complexType>
+
+  <xs:complexType name="LALSLILCSTargetProvisioningExtensions">
+    <xs:sequence>
+      <xs:element name="PositioningServiceType" type="PositioningServiceType"/>
+      <xs:element name="PositioningPeriodicity" type="PositioningPeriodicity" minOccurs="0"/>
+      <xs:element name="PositioningParameters" type="PositioningParameters" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:simpleType name="PositioningServiceType">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="Immediate"/>
+      <xs:enumeration value="Periodic"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="PositioningPeriodicity">
+    <xs:restriction base="xs:nonNegativeInteger">
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:complexType name="PositioningParameters">
+    <xs:sequence>
+      <xs:element name="RequestedLocationType" type="RequestedLocationType" minOccurs="0"/>
+      <xs:element name="RequestedResponseType" type="RequestedResponseType" minOccurs="0"/>
+      <xs:element name="MaxLocationAge" type="xs:nonNegativeInteger" minOccurs="0"/>
+      <xs:element name="ResponseTimingRequired" type="ResponseTimingRequired" minOccurs="0"/>
+      <xs:element name="ResponseTimer" type="xs:nonNegativeInteger" minOccurs="0"/>
+      <xs:element name="HorizontalAccuracy" type="NumberWithQOSClass" minOccurs="0"/>
+      <xs:element name="AltitudeAccuracy" type="NumberWithQOSClass" minOccurs="0"/>
+      <xs:element name="MotionStateRequest" type="EmptyElement" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:simpleType name="RequestedLocationType">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="CURRENT"/>
+      <xs:enumeration value="CURRENT_OR_LAST"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="RequestedResponseType">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="SYNC"/>
+      <xs:enumeration value="ASYNC"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="ResponseTimingRequired">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="NO_DELAY"/>
+      <xs:enumeration value="LOW_DELAY"/>
+      <xs:enumeration value="DELAY_TOL"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:complexType name="NumberWithQOSClass">
+    <xs:simpleContent>
+      <xs:extension base="xs:nonNegativeInteger">
+        <xs:attribute name="qos_class" type="QOSClass"/>
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:simpleType name="QOSClass">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="ASSURED"/>
+      <xs:enumeration value="BEST_EFFORT"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="EmptyElement">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value=""/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:complexType name="LALSLTFProvisioningExtensions">
+    <xs:sequence>
+      <xs:element name="LILCSClientAddress" type="LILCSClientIPAddress"/>
+      <xs:element name="PositioningParameters" type="PositioningParameters" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="LILCSClientIPAddress">
+    <xs:sequence>
+      <xs:choice>
+        <xs:element name="IPv4Address" type="common:IPv4Address"/>
+        <xs:element name="IPv6Address" type="common:IPv6Address"/>
+      </xs:choice>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="PDHRReportingExtensions">
+    <xs:sequence>
+      <xs:element name="PDHType" type="PDHType"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="PDHType">
+    <xs:choice>
+      <xs:element name="PDHR" type="EmptyElement"/>
+      <xs:element name="PDSR" type="PDSRParameters"/>
+    </xs:choice>
+  </xs:complexType>
+
+  <xs:complexType name="PDSRParameters">
+    <xs:sequence>
+      <xs:element name="PDSRTriggerType" type="PDSRTriggerType" minOccurs="1" maxOccurs="unbounded"/>
+      <xs:element name="useSessionTriggers" type="xs:boolean" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="PDSRTriggerType">
+    <xs:choice>
+      <xs:element name="TimerExpiry" type="TimerExpiryInSeconds"/>
+      <xs:element name="PacketCount" type="xs:nonNegativeInteger"/>
+      <xs:element name="ByteCount" type="xs:nonNegativeInteger"/>
+    </xs:choice>
+  </xs:complexType>
+
+  <xs:complexType name="SMSFProvisioningExtensions">
+    <xs:sequence>
+      <xs:element name="TruncateTPUserData" type="EmptyElement" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:simpleType name="TimerExpiryInSeconds">
+    <xs:restriction base="xs:nonNegativeInteger">
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:complexType name="IdentifierAssociationExtensions">
+    <xs:sequence>
+      <xs:element name="IdentifierAssociationEventsGenerated" type="IdentifierAssociationEventsGenerated"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:simpleType name="IdentifierAssociationEventsGenerated">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="IdentifierAssociation"/>
+      <xs:enumeration value="All"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:element name="IdentityAssociationTargetIdentifier" type="EmptyElement"/>
+
+  <xs:element name="AKMATargetIdentifier" type="AKMATargetIdentifier"/>
+  <xs:complexType name="AKMATargetIdentifier">
+    <xs:choice>
+      <xs:element name="AKID" type="common:NAI"/>
+    </xs:choice>
+  </xs:complexType>
+
+  <xs:element name="HR" type="EmptyElement"/>
+  <xs:element name="IMSSignaling" type="EmptyElement"/>
+  <xs:element name="APN" type="common:ShortString"/>
+  <xs:element name="DNN" type="common:ShortString"/>
+
+  <xs:element name="HRLIT1TargetIdentifierExtensions" type="HRLIT1TargetIdentifierExtensions"/>
+
+  <xs:complexType name="HRLIT1TargetIdentifierExtensions">
+    <xs:sequence>
+      <xs:element name="HRLIT1TargetIdentifier" type="HRLIT1TargetIdentifier" minOccurs="1" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="HRLIT1TargetIdentifier">
+    <xs:choice>
+      <xs:element name="PDUSessionID" type="PDUSessionID"/>
+      <xs:element name="BearerID" type="BearerID"/>
+      <xs:element name="IMSVoiceMedia" type="EmptyElement"/>
+    </xs:choice>
+  </xs:complexType>
+
+  <xs:simpleType name="PDUSessionID">
+    <xs:restriction base="xs:unsignedInt">
+      <xs:minInclusive value="0"/>
+      <xs:maxInclusive value="255"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="BearerID">
+    <xs:restriction base="xs:unsignedInt">
+      <xs:minInclusive value="0"/>
+      <xs:maxInclusive value="255"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:element name="RCSTargetIdentifierExtensions" type="RCSTargetIdentifierExtensions"/>
+
+  <xs:complexType name="RCSTargetIdentifierExtensions">
+    <xs:sequence>
+      <xs:element name="RCSTargetIdentifier" type="RCSTargetIdentifier" minOccurs="1" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="RCSTargetIdentifier">
+    <xs:choice>
+      <xs:element name="RCSContentURI" type="RCSContentURI"/>
+    </xs:choice>
+  </xs:complexType>
+
+  <xs:simpleType name="RCSContentURI">
+    <xs:restriction base="xs:anyURI"/>
+  </xs:simpleType>
+
+  <xs:element name="IMST3TargetIdentifierExtensions" type="IMST3TargetIdentifierExtensions"/>
+
+  <xs:complexType name="IMST3TargetIdentifierExtensions">
+    <xs:sequence>
+      <xs:element name="IMST3TargetIdentifierExtension" type="IMST3TargetIdentifierExtension" minOccurs="1" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="IMST3TargetIdentifierExtension">
+    <xs:choice>
+      <xs:element name="H248ContextID" type="H248ContextID"/>
+      <xs:element name="PayloadDirectionAssignment" type="PayloadDirectionAssignment"/>
+      <xs:element name="TriggerScope" type="TriggerScope"/>
+    </xs:choice>
+  </xs:complexType>
+
+  <xs:simpleType name="PayloadDirectionAssignment">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="ToTarget"/>
+      <xs:enumeration value="FromTarget"/>
+      <xs:enumeration value="NotDetermined"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="H248ContextID">
+    <xs:restriction base="xs:integer">
+      <xs:minInclusive value="1"/>
+      <xs:maxInclusive value="4294967293"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="TriggerScope">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="Unidirectional"/>
+      <xs:enumeration value="Bidirectional"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:complexType name="SDP">
+    <xs:sequence>
+      <xs:element name="SDPData" type="SDPData" minOccurs="1" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="SDPData">
+    <xs:choice>
+      <xs:element name="LocalSDP" type="SDPInfo"/>
+      <xs:element name="RemoteSDP" type="SDPInfo"/>
+    </xs:choice>
+  </xs:complexType>
+
+  <xs:simpleType name="SDPInfo">
+    <xs:restriction base="xs:string">
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:complexType name="STIRSHAKENTargetProvisioningExtensions">
+    <xs:sequence>
+      <xs:element name="ReportDiversionPASSporTInfo" type="ReportDiversionPASSporTInfo"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:simpleType name="ReportDiversionPASSporTInfo">
+    <xs:restriction base="xs:boolean">
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:complexType name="LocationOnlyProvisioningExtensions">
+    <xs:sequence>
+      <xs:element name="LocationOnly" type="EmptyElement" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:element name="DelegatedTaskStatus" type="DelegatedTaskStatus"/>
+
+  <xs:complexType name="DelegatedTaskStatus">
+      <xs:sequence>
+          <xs:element name="ListOfDelegatedTasks" type="ListOfDelegatedTasks"/>
+      </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="ListOfDelegatedTasks">
+      <xs:sequence>
+          <xs:element name="DelegatedTask" type="DelegatedTask" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="DelegatedTask">
+    <xs:sequence>
+        <xs:element name="NEID" type="x1:NeIdentifier"/>
+        <xs:element name="TaskDetails" type="x1:TaskDetails"/>
+        <xs:element name="TaskStatus" type="x1:TaskStatus" minOccurs="0"/>
+        <xs:element name="LastTaskStatusTime" type="common:QualifiedMicrosecondDateTime" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+</xs:schema>
diff --git a/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd b/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd
index 9bdd599147e8d4d150b5a3dc2fd2e995b798e782..9764799e6d805be15496754d576f1646ce7f3264 100644
--- a/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd
+++ b/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd
@@ -1,82 +1,82 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="urn:3GPP:ns:li:3GPPXLAExtensions:r18:v3" xmlns:x1="http://uri.etsi.org/03221/X1/2017/10" xmlns:common="http://uri.etsi.org/03280/common/2017/07" xmlns:liqr="urn:3GPP:ns:li:3GPPLIQueryExtensions:r18:v3" targetNamespace="urn:3GPP:ns:li:3GPPXLAExtensions:r18:v3" elementFormDefault="qualified">
-
-  <xs:import namespace="http://uri.etsi.org/03221/X1/2017/10"/>
-  <xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>
-  <xs:import namespace="urn:3GPP:ns:li:3GPPLIQueryExtensions:r18:v3"/>
-
-  <xs:complexType name="LocationAcquisitionRequest">
-    <xs:complexContent>
-      <xs:extension base="liqr:LIQueryRequest">
-        <xs:sequence>
-          <xs:element name="ReqCurrentLoc" type="xs:boolean" default="false"/>
-          <xs:element name="HILADelivery" type="xs:boolean" minOccurs="0"/>
-          <xs:element name="HI2Delivery" type="MDF2DeliveryStructure" minOccurs="0"/>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name="LocationAcquisitionResponse">
-    <xs:complexContent>
-      <xs:extension base="x1:X1ResponseMessage">
-        <xs:sequence>
-          <xs:element name="ResponseDetails" type="LocationResponseDetails" minOccurs="0"/>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-<xs:complexType name="MDF2DeliveryStructure">
-    <xs:sequence>
-        <xs:element name="XID" type="x1:XId"/>
-        <xs:element name="ListOfDestinations" type="ListOfDestinations"/>
-    </xs:sequence>
-  </xs:complexType>
-
-<xs:element name="LIHILAResponse" type="LocationResponseDetails"/>
-
-<xs:complexType name="ListOfDestinations">
-    <xs:sequence>
-        <xs:element name="Destination" type="x1:DestinationDetails" maxOccurs="unbounded"/>
-    </xs:sequence>
-</xs:complexType>
-
-<xs:complexType name="LocationResponseDetails">
-    <xs:sequence>
-      <xs:element name="LocationOutcomes" type="LocationOutcomes" minOccurs="0"/>
-      <xs:element name="EPCLocationOutcomes" type="EPCLocationOutcomes" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="LocationOutcomes">
-    <xs:sequence>
-      <xs:element name="LocationOutcome" type="LocationOutcome" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="EPCLocationOutcomes">
-    <xs:sequence>
-      <xs:element name="EPCLocationOutcome" type="EPCLocationOutcome" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="LocationOutcome">
-    <xs:sequence>
-      <xs:element name="SUPI" type="liqr:SUPI"/>
-      <xs:element name="GPSI" type="liqr:GPSI" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="Location" type="liqr:TS29518Location" minOccurs="0"/>
-      <xs:element name="FailureCause" type="liqr:ErrorInformation" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="EPCLocationOutcome">
-    <xs:sequence>
-      <xs:element name="IMSI" type="common:IMSI"/>
-      <xs:element name="MSISDNs" type="common:InternationalE164" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="Location" type="liqr:TS29272Location" minOccurs="0"/>
-      <xs:element name="FailureCause" type="liqr:ErrorInformation" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
-</xs:schema>
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="urn:3GPP:ns:li:3GPPXLAExtensions:r18:v4" xmlns:x1="http://uri.etsi.org/03221/X1/2017/10" xmlns:common="http://uri.etsi.org/03280/common/2017/07" xmlns:liqr="urn:3GPP:ns:li:3GPPLIQueryExtensions:r18:v4" targetNamespace="urn:3GPP:ns:li:3GPPXLAExtensions:r18:v4" elementFormDefault="qualified">
+
+  <xs:import namespace="http://uri.etsi.org/03221/X1/2017/10"/>
+  <xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>
+  <xs:import namespace="urn:3GPP:ns:li:3GPPLIQueryExtensions:r18:v4"/>
+
+  <xs:complexType name="LocationAcquisitionRequest">
+    <xs:complexContent>
+      <xs:extension base="liqr:LIQueryRequest">
+        <xs:sequence>
+          <xs:element name="ReqCurrentLoc" type="xs:boolean" default="false"/>
+          <xs:element name="HILADelivery" type="xs:boolean" minOccurs="0"/>
+          <xs:element name="HI2Delivery" type="MDF2DeliveryStructure" minOccurs="0"/>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:complexType name="LocationAcquisitionResponse">
+    <xs:complexContent>
+      <xs:extension base="x1:X1ResponseMessage">
+        <xs:sequence>
+          <xs:element name="ResponseDetails" type="LocationResponseDetails" minOccurs="0"/>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+<xs:complexType name="MDF2DeliveryStructure">
+    <xs:sequence>
+        <xs:element name="XID" type="x1:XId"/>
+        <xs:element name="ListOfDestinations" type="ListOfDestinations"/>
+    </xs:sequence>
+  </xs:complexType>
+
+<xs:element name="LIHILAResponse" type="LocationResponseDetails"/>
+
+<xs:complexType name="ListOfDestinations">
+    <xs:sequence>
+        <xs:element name="Destination" type="x1:DestinationDetails" maxOccurs="unbounded"/>
+    </xs:sequence>
+</xs:complexType>
+
+<xs:complexType name="LocationResponseDetails">
+    <xs:sequence>
+      <xs:element name="LocationOutcomes" type="LocationOutcomes" minOccurs="0"/>
+      <xs:element name="EPCLocationOutcomes" type="EPCLocationOutcomes" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="LocationOutcomes">
+    <xs:sequence>
+      <xs:element name="LocationOutcome" type="LocationOutcome" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="EPCLocationOutcomes">
+    <xs:sequence>
+      <xs:element name="EPCLocationOutcome" type="EPCLocationOutcome" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="LocationOutcome">
+    <xs:sequence>
+      <xs:element name="SUPI" type="liqr:SUPI"/>
+      <xs:element name="GPSI" type="liqr:GPSI" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="Location" type="liqr:TS29518Location" minOccurs="0"/>
+      <xs:element name="FailureCause" type="liqr:ErrorInformation" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="EPCLocationOutcome">
+    <xs:sequence>
+      <xs:element name="IMSI" type="common:IMSI"/>
+      <xs:element name="MSISDNs" type="common:InternationalE164" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="Location" type="liqr:TS29272Location" minOccurs="0"/>
+      <xs:element name="FailureCause" type="liqr:ErrorInformation" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+</xs:schema>