diff --git a/ASN/TS32298_CHFChargingDataTypes.asn b/ASN/TS32298_CHFChargingDataTypes.asn
index 6dae6a4fcd508afb7a88ad54bdf37f6e69782099..21b6e028325564f61d8bb2e0f562d66d972dd130 100644
--- a/ASN/TS32298_CHFChargingDataTypes.asn
+++ b/ASN/TS32298_CHFChargingDataTypes.asn
@@ -17,6 +17,7 @@ EnhancedDiagnostics,
 DynamicAddressFlag,
 InvolvedParty,
 IPAddress,
+LCSClientIdentity,
 LocalSequenceNumber,
 ManagementExtensions,
 MessageClass,
@@ -28,6 +29,7 @@ Ncgi,
 Nid,
 NodeAddress,
 PLMN-Id,
+PositioningData,
 PriorityType,
 PSCellInformation,
 RANNASCause,
@@ -542,7 +544,7 @@ IMSChargingInformation	::= SET
 	tadIdentifier							[56] TADIdentifier OPTIONAL,
 	feIdentifierList						[57] FEIdentifierList OPTIONAL,
 	imsDCAppInfo							[58] IMSDCAppInfo OPTIONAL,
-	satelliteIDList							[110] SEQUENCE Of SatelliteID OPTIONAL
+	satelliteIDList							[110] SEQUENCE OF SatelliteID OPTIONAL
 }
 
 
@@ -743,14 +745,14 @@ RangingSLChargingInformation	::= SET
 	sLPositioningServerUEID					[2] SubscriptionID OPTIONAL,
 	locatedUEID								[3] SubscriptionID OPTIONAL,
 	locationType							[4] LocationType OPTIONAL,
-	locationEstimate						[5] UserLocation OPTIONAL
+	locationEstimate						[5] UserLocationInformationStructured OPTIONAL
 }
 
 LCSInformation	::= SET
 {
 	lCSClientID								[0] LCSClientIdentity OPTIONAL,
 	locationType							[1] LocationType OPTIONAL,
-	locationEstimate						[2] UserLocation OPTIONAL,
+	locationEstimate						[2] UserLocationInformationStructured OPTIONAL,
 	positioningData							[3] PositioningData OPTIONAL,
 	targetUEID								[4] SubscriptionID OPTIONAL
 }
@@ -2047,6 +2049,31 @@ Sac		::= UTF8String
 -- See 3GPP TS 29.571 [249] for details
 -- 
 
+
+SatelliteBackhaulInformation 	::= SEQUENCE
+{
+	satelliteBackhaulCategory			[0] SatelliteBackhaulCategory OPTIONAL,
+	gEOSatelliteID					[1] UTF8String OPTIONAL 
+
+}
+-- See 3GPP TS 29.571 [249] for details.
+
+SatelliteBackhaulCategory ::= ENUMERATED
+{
+	gEO   				(0),
+	mEO 				(1),
+	lEO					(2),
+	oTHERSAT 			(3),
+	dYNAMICGEO 			(4),
+	dYNAMICMEO			(5),
+	dYNAMICLEO 			(6),
+	dYNAMICOTHERSAT 	(7),
+	nONSATELLITE		(8)
+
+}
+
+SatelliteID 	::= UTF8String
+
 ServiceArea ::= SEQUENCE
 {
 	mBSServiceArea	[0] MbsServiceArea OPTIONAL,
@@ -2350,31 +2377,6 @@ SynchronizationState			::= ENUMERATED
 }
 
 
-SatelliteBackhaulInformation 	::= SEQUENCE
-{
-	satelliteBackhaulCategory			[0] SatelliteBackhaulCategory OPTIONAL,
-	gEOSatelliteID					[1] UTF8String OPTIONAL 
-
-}
--- See 3GPP TS 29.571 [249] for details.
-
-
-SatelliteBackhaulCategory ::= ENUMERATED
-{
-	gEO   				(0),
-	mEO 				(1),
-	lEO					(2),
-	oTHERSAT 			(3),
-	dYNAMICGEO 			(4),
-	dYNAMICMEO			(5),
-	dYNAMICLEO 			(6),
-	dYNAMICOTHERSAT 	(7),
-	nONSATELLITE		(8)
-
-}
-
-SatelliteID 	::= UTF8String OPTIONAL
-
 -- 
 -- T
 -- 
diff --git a/ASN/TS32298_CPDTChargingDataTypes.asn b/ASN/TS32298_CPDTChargingDataTypes.asn
index 1346c5de11701f2a8b1be65cafb9313e07a96c67..bb217f1ceba6293109ad65d8c09a204d83481e74 100644
--- a/ASN/TS32298_CPDTChargingDataTypes.asn
+++ b/ASN/TS32298_CPDTChargingDataTypes.asn
@@ -173,4 +173,5 @@ SubmissionResultCode		::= INTEGER
 -- for MO/MT data transfer
 --
 
-END
\ No newline at end of file
+
+END           
\ No newline at end of file
diff --git a/ASN/TS32298_IMSChargingDataTypes.asn b/ASN/TS32298_IMSChargingDataTypes.asn
index 8ad4698906bf8eb195f46ac6ca54226271559129..2b8902814b11285d410c2d365691925b55424993 100644
--- a/ASN/TS32298_IMSChargingDataTypes.asn
+++ b/ASN/TS32298_IMSChargingDataTypes.asn
@@ -185,7 +185,7 @@ PCSCFRecord		::= SET
 	relatedICID								[107] IMS-Charging-Identifier OPTIONAL,
 	relatedICIDGenerationNode				[108] NodeAddress OPTIONAL,
 	fEIdentifierList                        [109] FEIdentifierList OPTIONAL,
-	satelliteIDList							[110] SEQUENCE Of SatelliteID OPTIONAL
+	satelliteIDList							[110] SEQUENCE OF SatelliteID OPTIONAL
 
 
 }
@@ -1016,7 +1016,7 @@ Status		::= ENUMERATED
 	time-out			(2)
 }
 
-SatelliteID 	::= UTF8String OPTIONAL
+SatelliteID 	::= UTF8String
 
 -- 
 -- T
diff --git a/ASN/TS32298_ProSeChargingDataTypes.asn b/ASN/TS32298_ProSeChargingDataTypes.asn
index 3ffbc7e73ee9fcaedb31cb76ae1e2ee0ff5f0b40..f0eb65473030a5de25a9bf889f82bddee2afcf0b 100644
--- a/ASN/TS32298_ProSeChargingDataTypes.asn
+++ b/ASN/TS32298_ProSeChargingDataTypes.asn
@@ -143,12 +143,10 @@ PFDCRecord 	::= SET
 	listOfReceptionData				[23] SEQUENCE OF ChangeOfProSeCondition OPTIONAL,
 	causeForRecClosing				[24] ProSeCauseForRecClosing,
 	listOfAppSpecificData			[25] SEQUENCE OF AppSpecificData,
-targetIPaddress					[26] IPAddress OPTIONAL,
+	targetIPaddress					[26] IPAddress OPTIONAL,
 	relayIPaddress					[27] IPAddress OPTIONAL,
-proSeUEtoNetworkRelayUEID		[28] OCTET STRING OPTIONAL,
-proSeTargetLayerTwoID			[29] OCTET STRING OPTIONAL	
-	hopCount					[30] INTEGER OPTIONAL
-	intermediateRelayInformationContainer				[31] SEQUENCE OF intermediateRelayInformation OPTIONAL			
+	proSeUEtoNetworkRelayUEID		[28] OCTET STRING OPTIONAL,
+	proSeTargetLayerTwoID			[29] OCTET STRING OPTIONAL
 }
 
 --
@@ -195,11 +193,13 @@ CoverageStatus				::= ENUMERATED
 --
 -- I
 --
-intermediateRelayInformation	::= SEQUENCE
+
+IntermediateRelayInformation	::= SEQUENCE
 {
-	intermediateRelayIPAddress			[0] IPAddress OPTIONAL
-	proSeUEtoNetworkIntermediateRelayUEID			[1] OCTET STRING OPTIONAL,
+	intermediateRelayIPAddress				[0] IPAddress OPTIONAL,
+	proSeUEtoNetworkIntermediateRelayUEID	[1] OCTET STRING OPTIONAL
 }
+
 -- 
 -- L
 -- 
diff --git a/ASN/TS32298_SMSChargingDataTypes.asn b/ASN/TS32298_SMSChargingDataTypes.asn
index 4a111f08e659c32218dad70b0672b48f3188d413..b4995abf5ad6d7ead3e3b5df5f2b8215b6ee20af 100644
--- a/ASN/TS32298_SMSChargingDataTypes.asn
+++ b/ASN/TS32298_SMSChargingDataTypes.asn
@@ -267,7 +267,8 @@ RecipientInfo	::= SEQUENCE
 	sMRecipientProtocolID		[6] OCTET STRING OPTIONAL,
 	recipientOtherAddresses		[7] SEQUENCE OF SMAddressInfo OPTIONAL,
 									-- included for backwards compatibility
-	recipientOtherAddresses		[8] SEQUENCE OF RecipientAddress OPTIONAL
+	recipientOtherAddressList	[8] SEQUENCE OF RecipientAddress OPTIONAL
+									-- used if type different from IMSI and MSISDN
 } 
 
 RecipientAddress	::= SEQUENCE
@@ -388,13 +389,13 @@ SMSStatus		::= OCTET STRING (SIZE(1))
 SatelliteStoreAndForwardInformation 	::= SEQUENCE
 {
 	storeAndForwardIndicator		[0] BOOLEAN OPTIONAL,
-	satelliteIDList					[1] SEQUENCE Of SatelliteID OPTIONAL,
+	satelliteIDList					[1] SEQUENCE OF SatelliteID OPTIONAL,
 	storeDuration					[2] CallDuration OPTIONAL,
 	storeDataVolume					[3]	DataVolume OPTIONAL
 
 }
 
-SatelliteID 	::= UTF8String OPTIONAL
+SatelliteID 	::= UTF8String
 
 
 END
\ No newline at end of file