Fix bug ignoring last entry in each format table block

4 files changed, 4247 insertions, 248 deletions

diff --git a/main.c b/main.c
index 56eaee9..852b9ac 100644
--- a/main.c
+++ b/main.c
@@ -183,13 +183,6 @@ static void handle_fmt_block(struct word_handle *wh, uint16_t block_nr,
 	fprintf(stderr, "Number of format table entries: %u\n", num_fmts);
 
 	for (i = 0; i < num_fmts; i++) {
-		if (i == num_fmts -1) {
-			/* in the last entry, check if there is another block */
-			if (fmt_tbl[i].ptr_text == offset_next) {
-				handle_fmt_block(wh, block_nr+1, type);
-				continue;
-			}
-		}
 		fprintf(stderr, "Format tbl entry Text Ptr: %u (0x%x), Fmt: %u\n",
 			fmt_tbl[i].ptr_text, fmt_tbl[i].ptr_text, fmt_tbl[i].offset_fmt);
 		if (fmt_tbl[i].offset_fmt != 0xffff)
@@ -205,6 +198,13 @@ static void handle_fmt_block(struct word_handle *wh, uint16_t block_nr,
 			break;
 		}
 		last_fmt_start = fmt_tbl[i].ptr_text;
+
+		if (i == num_fmts -1) {
+			/* in the last entry, check if there is another block */
+			if (fmt_tbl[i].ptr_text == offset_next) {
+				handle_fmt_block(wh, block_nr+1, type);
+			}
+		}
 	}
 }
 
diff --git a/output/380-s06.asn1 b/output/380-s06.asn1
index 85b3068..470ab8a 100644
--- a/output/380-s06.asn1
+++ b/output/380-s06.asn1
@@ -1,16 +1,18 @@
-MAP-Operations DEFINITIONS ::= 
+MAP-Operations DEFINITIONS ::=
 
 BEGIN
 
 EXPORTS
 
+-- exports operations types	
 
 -- Location management
 UpdateLocationArea, UpdateLocation, CancelLocation, DetachIMSI, AttachIMSI,
-DeregisterMobileSubscriber, 
+DeregisterMobileSubscriber,
 
 -- Subscriber data management
 InsertSubscriberData, DeleteSubscriberData, SendParameters,
+
 -- Supplementary Services Handling
 RegisterSS, EraseSS, ActivateSS,
 DeactivateSS, InterrogateSS, InvokeSS, ForwardSsNotification,
@@ -18,6 +20,7 @@ RegisterPassword, GetPassword, ProcessUnstructuredSsData,
 
 -- Call set-up
 SendInfoForIncomingCall, SendInfoForOutgoingCall,
+SendRoutingInformation, ProvideRoamingNumber, CompleteCall,
 ConnectToFollowingAddress, ProcessCallWaiting,
 
 -- Paging
@@ -25,61 +28,71 @@ ConnectToFollowingAddress, ProcessCallWaiting,
 
 -- Handover
  PerformHandover, SendEndSignal,
-SendHandoverReport,ProcessAccessSignalling,
-ForwardAccessSignalling, 
+PerformSubsequentHandover, AllocateHandoverNumber,
+SendHandoverReport, ProcessAccessSignalling,
+ForwardAccessSignalling,
 
 -- Charging
-RegisterChargingInformation, 
+RegisterChargingInformation,
 
 -- Fault recovery
+Reset, ForwardCheckSsIndication,
 
 -- Tracing
 ActivateTraceMode, DeactivateTraceMode, TraceSubscriberActivity,
-NoteInternalHandover, 
-  
+NoteInternalHandover,
+
 -- Equipment management
 CheckIMEI,
--- Authentication and security 
+
+-- Authentication and security
 Authenticate, ProvideIMSI, ForwardNewTMSI, SetCipheringMode,
 
 -- Short messages
 SendRoutingInfoForSM, ForwardShortMessage, SetMessageWaitingData, NoteMSPresent, AlertServiceCentre,
 
 -- Access request
+ProcessAccessRequest, BeginSubscriberActivity;
 
 
-IMPORTS 
+IMPORTS
 OPERATION FROM TCAPMessages {ccitt recommendation q 773 moduleA(0)}
 
 -- imports data types
 
+AddressString, IsdnAddressString, ExternalSignalInfo,
 IMSI, TMSI, SubscriberId, IMEI, LMsId, LocAreaId, GlobalCellId,
 LocationInfo, HlrList, Category, EquipStatus, BasicServiceList,
 BasicServiceCode, BearerServiceCode, TeleserviceCode,
-SubscriberData, SS-Information, SS-DataList, SS-Code,  
+SubscriberData, SS-Information, SS-DataList, SS-Code,
 SS-CodeList, SS-Status, SS-Notification, Password, ChannelType,
-NoReplyConditionTime, UserToUserServiceIndicator, 
+NoReplyConditionTime, UserToUserServiceIndicator,
 CUG-Index, CUG-Interlock, NumberOfConferees, NumberOfForwarding, ForwardingData, ForwardingFeatureList, ForwardingOptions, ClassmarkInformation, HandoverType, HandoverPriority, CallReference, CallType, CallDateTime, CallStatus, CallDuration, PacketDataVolume, ChargingUnit, Charge, SS-ChargingInfo,
-AccessConnectionStatus, Rand, Sres,CipheringMode, Kc, CKSN, 
-SS-UserData, RequestParameters, SentParameters, SM-RP-OA, 
+TraceReference, TraceType, NetworkResource, CmServiceType,
+AccessConnectionStatus, Rand, Sres, CipheringMode, Kc, CKSN,
+SS-UserData, RequestParameters, SentParameters, SM-RP-OA,
 SM-RP-DA, SM-RP-UI, GuidanceInfo FROM MAP-DataTypes
 
 -- imports errors types
 
 UnknownSubscriber, UnknownBaseStation, UnknownMSC,
+UnknownLocArea, UnidentifiedSubscriber,
 UnallocatedRoamingNumber, UnknownEquipment,
 RoamingNotAllowed, IllegalMS, BearerServiceNotProvisioned,
 TeleserviceNotProvisioned, InsufficientBearerCapabilities,
-CallBarred, ForwardingViolation, CUG-Reject, IllegalSS-Operation, 
-SS-ErrorStatus, SS-NotAvailable, SS-SubscriptionViolation, 
+CallBarred, ForwardingViolation, CUG-Reject, IllegalSS-Operation,
+SS-ErrorStatus, SS-NotAvailable, SS-SubscriptionViolation,
 SS-Incompatibility, InvalidTargetBaseStation,
 NoRadioResourceAvailable, NoHandoverNumberAvailable,
+SubsequentHandoverFailure, AbsentSubscriber, BusySubscriber,
 NoSubscriberReply, RadioCongestion, ImpossibleCallCompletion,
 SystemFailure, DataMissing, UnexpectedDataValue,
-PasswordRegistrationFailure, NegativePasswordCheck, 
+PasswordRegistrationFailure, NegativePasswordCheck,
 NoRoamingNumberAvailable, TracingBufferFull, FacilityNotSupported, SM-DeliveryFailure, MessageWaitingListFull FROM MAP-Errors;
- 
+
+
 -- operation types definitions
+-- Location management operations
 
 UpdateLocationArea ::= OPERATION
 PARAMETER	SEQUENCE{
@@ -87,6 +100,7 @@ PARAMETER	SEQUENCE{
 	previousLocAreaId	CHOICE{
 				LocAreaId,
 				NULL},
+	targetLocAreaId	LocAreaId,
 	cksn		CKSN }
 
 RESULT
@@ -94,6 +108,7 @@ RESULT
 ERRORS	
 	{UnknownSubscriber,
 	UnknownLocArea,
+	RoamingNotAllowed,
 	IllegalMS,
 	SystemFailure,
 	UnexpectedDataValue}
@@ -101,13 +116,15 @@ ERRORS
 --
 UpdateLocation ::= OPERATION
 PARAMETER	SEQUENCE{
+	imsi		IMSI,
 	locationInfo		LocationInfo,	
 	vlrNumber		IsdnAddressString,
 	lmsId		[10] IMPLICIT LMsId OPTIONAL}
 
 RESULT
-	hlrNumber		IsdnAddressString 
+	hlrNumber		IsdnAddressString
 
+ERRORS	
 	{UnknownSubscriber,
 	RoamingNotAllowed,
 	SystemFailure,
@@ -115,6 +132,7 @@ RESULT
 
 --
 CancelLocation ::= OPERATION
+PARAMETER	CHOICE{
 	imsi		IMSI,
 			SEQUENCE{
 	imsi			IMSI,
@@ -122,15 +140,17 @@ CancelLocation ::= OPERATION
 
 RESULT
 
+ERRORS
 	{UnidentifiedSubscriber,
 	UnexpectedDataValue}
- 
- 
+
+
 --
 DetachIMSI ::= OPERATION
 PARAMETER
 	subscriberId	SubscriberId
 
+--
 AttachIMSI ::= OPERATION
 PARAMETER
 	subscriberId	SubscriberId
@@ -138,6 +158,7 @@ PARAMETER
 RESULT
 
 ERRORS
+	{UnknownSubscriber,
 	UnidentifiedSubscriber,
 	IllegalMS,
 	RoamingNotAllowed,
@@ -145,6 +166,7 @@ ERRORS
 	UnexpectedDataValue}
 
 --
+DeregisterMobileSubscriber ::= OPERATION
 PARAMETER
 	imsi		IMSI
 
@@ -152,13 +174,15 @@ RESULT
 
 ERRORS
 	{AbsentSubscriber,
+	UnknownSubscriber,
 	FacilityNotSupported,
 	UnexpectedDataValue}
 
- 
- 
+
+
 -- Subscriber data management
 
+InsertSubscriberData ::= OPERATION
 PARAMETER	SEQUENCE{
 	imsi		[0] IMPLICIT IMSI OPTIONAL,
 			COMPONENTS OF SubscriberData}
@@ -166,6 +190,7 @@ PARAMETER	SEQUENCE{
 RESULT
 
 ERRORS
+	{UnidentifiedSubscriber,
 	DataMissing,
 	UnexpectedDataValue}
 
@@ -173,6 +198,7 @@ ERRORS
 DeleteSubscriberData ::= OPERATION
 PARAMETER	SEQUENCE{
 	imsi 		[0] IMPLICIT IMSI,
+	basicService	[1] IMPLICIT BasicServiceList OPTIONAL,
 	ss-Code		[2] IMPLICIT SS-CodeList OPTIONAL}
 
 RESULT
@@ -180,6 +206,7 @@ RESULT
 ERRORS
 	{UnidentifiedSubscriber,
 	DataMissing,
+	UnexpectedDataValue}
 
 
 --
@@ -187,21 +214,24 @@ SendParameters ::= OPERATION
 PARAMETER	SEQUENCE{
 	subscriberId	SubscriberId,
 	requestParameters	RequestParameters}
+
 RESULT
-	sentParameters	SentParameters 
-	-- optional (nothing is returned, if the requested 
+	sentParameters	SentParameters
+	-- optional (nothing is returned, if the requested
 	-- parameters are not available or do not exist)
 
 ERRORS
 	{UnknownSubscriber,
+	UnidentifiedSubscriber,
 	UnexpectedDataValue}
- 
- 
+
+
 -- Supplementary services handling
 --
 RegisterSS ::= OPERATION
 PARAMETER	SEQUENCE{
 	ss-Code		SS-Code,
+	basicService	BasicServiceCode OPTIONAL,
 	forwardedToNumber	[4] IMPLICIT IsdnAddressString OPTIONAL,
 	noReplyConditionTime	[5] IMPLICIT NoReplyConditionTime OPTIONAL}
 
@@ -209,6 +239,7 @@ RESULT
 	ss-Information	SS-Information -- optional
 
 ERRORS
+	{UnknownSubscriber,
 	IllegalSS-Operation,
 	SS-ErrorStatus,
 	SS-NotAvailable,
@@ -216,6 +247,7 @@ ERRORS
 	TeleServiceNotProvisioned,
 	SS-SubscriptionViolation,
 	SS-Incompatibility,
+	NegativePasswordCheck,
 	UnexpectedDataValue,
 	DataMissing,
 	SystemFailure}
@@ -223,6 +255,7 @@ ERRORS
 
 --
 EraseSS ::= OPERATION
+PARAMETER	SEQUENCE{
 	ss-Code		SS-Code,
 	basicService	BasicServiceCode OPTIONAL}
 
@@ -230,14 +263,17 @@ RESULT
 	ss-Information	SS-Information -- optional
 
 ERRORS
+	{UnknownSubscriber,
 	NegativePasswordCheck,
 	IllegalSS-Operation,
 	SS-ErrorStatus,
 	SS-SubscriptionViolation,
 	UnexpectedDataValue,
 	SystemFailure}
- 
+
+
 --
+ActivateSS ::= OPERATION
 PARAMETER	SEQUENCE{
 	ss-Code		SS-Code,
 	basicService	BasicServiceCode OPTIONAL}
@@ -245,6 +281,7 @@ PARAMETER	SEQUENCE{
 RESULT
 	ss-Information	SS-Information -- optional
 
+ERRORS
 	{UnknownSubscriber,
 	NegativePasswordCheck,
 	IllegalSS-Operation,
@@ -252,6 +289,7 @@ RESULT
 	SS-NotAvailable,
 	SS-SubscriptionViolation,
 	SS-Incompatibility,
+	UnexpectedDataValue,
 	SystemFailure}
 
 --
@@ -260,18 +298,22 @@ PARAMETER	SEQUENCE{
 	ss-Code		SS-Code,
 	basicService	BasicServiceCode OPTIONAL}
 
+
 RESULT
 	ss-Information	SS-Information -- optional
 
 ERRORS
 	{UnknownSubscriber,
 	IllegalSS-Operation,
+	SS-ErrorStatus,
 	SS-SubscriptionViolation,
 	NegativePasswordCheck,
 	UnexpectedDataValue,
 	SystemFailure}
- 
+
+
 --
+InterrogateSS ::= OPERATION
 PARAMETER	SEQUENCE{
 	ss-Code		SS-Code,
 	basicService	BasicServiceCode OPTIONAL}
@@ -279,6 +321,7 @@ PARAMETER	SEQUENCE{
 RESULT 		CHOICE{
 	ss-Status		[0] IMPLICIT SS-Status,
 	forwardedToNumber	[1] IMPLICIT IsdnAddressString,	
+	activesBasicServices	[2] IMPLICIT BasicServiceList,
 	forwardingFeatureList	[3] IMPLICIT ForwardingFeatureList}
 
 
@@ -286,6 +329,7 @@ ERRORS
 	{UnknownSubscriber,
 	NegativePasswordCheck,
 	IllegalSS-Operation,
+	SS-NotAvailable,
 	UnexpectedDataValue,
 	SystemFailure}
 
@@ -293,6 +337,7 @@ ERRORS
 InvokeSS ::= OPERATION
 PARAMETER	SEQUENCE{
 	ss-Code		SS-Code,
+	basicService	BasicServiceCode OPTIONAL,
 	userToUserServiceIndicator	[4] IMPLICIT UserToUserServiceIndicator OPTIONAL, 	
 	cug-Index		[5] IMPLICIT CUG-Index OPTIONAL,
 	numberOfConferees	[6] IMPLICIT NumberOfConferees OPTIONAL}
@@ -300,6 +345,7 @@ PARAMETER	SEQUENCE{
 RESULT
 	cug-Interlock	CUG-Interlock -- optional
 
+
 ERRORS
 	{IllegalSS-Operation,
 	SS-ErrorStatus,
@@ -307,15 +353,17 @@ ERRORS
 	SS-SubscriptionViolation,
 	SS-Incompatibility,
 	CUG-Reject,
+	DataMissing,
 	UnexpectedDataValue,
 	SystemFailure}
- 
+
 --
 ForwardSsNotification ::= OPERATION
 PARAMETER	SEQUENCE{
 	imsi		[0] IMPLICIT IMSI OPTIONAL,
 	ss-Code		[1] IMPLICIT SS-Code OPTIONAL,
 	teleservice		[2] IMPLICIT TeleserviceCode OPTIONAL,
+	bearerService	[3] IMPLICIT BearerServiceCode OPTIONAL,
 	ss-Status		[4] IMPLICIT SS-Status OPTIONAL,
 	ss-Notification	[5] IMPLICIT SS-Notification OPTIONAL}
 
@@ -323,6 +371,7 @@ PARAMETER	SEQUENCE{
 RegisterPassword ::= OPERATION
 
 PARAMETER
+	ss-Code		SS-Code
 
 RESULT
 	newPassword 	Password
@@ -330,6 +379,7 @@ RESULT
 ERRORS
 	{NegativePasswordCheck,
 	PasswordRegistrationFailure,
+	SS-SubscriptionViolation,
 	UnexpectedDataValue,
 	SystemFailure}
 
@@ -337,6 +387,7 @@ LINKED
 	{GetPassword}
 
 --
+GetPassword ::= OPERATION
 PARAMETER
 	guidanceInfo	GuidanceInfo
 
@@ -344,27 +395,31 @@ RESULT
 	currentPassword	Password
 
 --
+ProcessUnstructuredSsData ::= OPERATION
 PARAMETER
-	ss-UserData		SS-UserData	 
+	ss-UserData		SS-UserData	
 
 RESULT
 	ss-UserData		SS-UserData -- optional
 
 ERRORS
+	{UnexpectedDataValue,
 	SystemFailure}
 	-- UnexpectedDataValue is used when data from MS does not correspond
 	-- to any service implemented in HLR
- 
- 
+
+
 -- Call set-up
 --
+SendInfoForIncomingCall ::= OPERATION
 PARAMETER		SEQUENCE{
 	incomingId		CHOICE{
 	roamingNumber	[0] IMPLICIT IsdnAddressString,
 	imsi		[1] IMPLICIT IMSI},
 	bearerService	[2] IMPLICIT BearerServiceCode OPTIONAL,
-	teleservice		[3] IMPLICIT TeleserviceCode OPTIONAL, 
+	teleservice		[3] IMPLICIT TeleserviceCode OPTIONAL,
 	lMsId		[4] IMPLICIT LMsId OPTIONAL,
+	dialledNumber	[5] IMPLICIT IsdnAddressString OPTIONAL,
 	cug-Interlock	[6] IMPLICIT CUG-Interlock OPTIONAL,
 	numberOfForwarding	[7] IMPLICIT NumberOfForwarding OPTIONAL}
 
@@ -372,6 +427,7 @@ ERRORS
 	UnallocatedRoamingNumber,
 	UnknownSubscriber,
 	UnidentifiedSubscriber,
+	AbsentSubscriber,
 	ImpossibleCallCompletion,
 	ForwardingViolation,
 	UnexpectedDataValue,
@@ -379,6 +435,7 @@ ERRORS
 	SystemFailure}
 
 LINKED
+	CompleteCall,
 	ProcessCallWaiting,
 	ConnectToFollowingAddress}
 
@@ -386,6 +443,7 @@ LINKED
 SendInfoForOutgoingCall ::= OPERATION
 PARAMETER	SEQUENCE{
 	calledNumber	[0] IMPLICIT IsdnAddressString,
+	bearerService	[2] IMPLICIT BearerServiceCode OPTIONAL,
 	teleService		[3] IMPLICIT TeleserviceCode OPTIONAL}
 
 ERRORS
@@ -393,28 +451,33 @@ ERRORS
 	BearerServiceNotProvisioned,
 	TeleserviceNotProvisioned,
 	CallBarred,
+	CUG-Reject,
 	DataMissing,
 	UnexpectedDataValue,
 	SystemFailure}
 
 LINKED
 	{CompleteCall}
- 
+
+
 SendRoutingInformation ::= OPERATION
+PARAMETER	SEQUENCE{
 	msIsdn		[0]  IMPLICIT IsdnAddressString,
 	cug-Interlock	[1]  IMPLICIT CUG-Interlock OPTIONAL,
 	numberOfForwarding	[2]  IMPLICIT NumberOfForwarding OPTIONAL,
 	networkSignalInfo	[10] IMPLICIT ExternalSignalInfo OPTIONAL}
 
--- If available from the network the  ISDN Bearer Capabilities
--- the ISDN High Layer Compatibility and Low Layer Compatibility
--- value of the networkSignalInfo element 
+-- If available from the network the ISDN Bearer Capabilities and the ISDN High Layer
+-- Compatibility and Low Layer Compatibility information elements are included in
+-- the networkSignalInfo parameter as defined in section 6.4.3.8.9.
+-- The information is passed according to the rules specified in GSM 09.07.
 
 RESULT		SEQUENCE{
 	imsi		IMSI,
 	routingInfo		CHOICE{
 	roamingNumber		IsdnAddressString,
 	forwardingData		ForwardingData}}
+	
 ERRORS
 	UnknownSubscriber,
 	CallBarred,
@@ -422,26 +485,32 @@ ERRORS
 	BearerServiceNotProvisioned,
 	TeleServiceNotProvisioned,
 	FacilityNotSupported,
+	AbsentSubscriber,
 	ForwardingViolation,
 	SystemFailure,
 	DataMissing,
 	UnexpectedDataValue}
- 
+
+
 ProvideRoamingNumber ::= OPERATION
+
 PARAMETER	SEQUENCE{
 	imsi		[0] IMPLICIT IMSI,
-	mscNumber	[1] IMPLICIT IsdnAddressString OPTIONAL,
+	mscNumber		[1] IMPLICIT IsdnAddressString OPTIONAL,
 	msIsdn		[2] IMPLICIT IsdnAddressString OPTIONAL,
 	previousRoamingNumber  [3] IMPLICIT IsdnAddressString OPTIONAL,
 	lMsId		[4] IMPLICIT LMsId OPTIONAL,
 	gSM-BearerCapability	[5] IMPLICIT ExternalSignalInfo OPTIONAL,
+	networkSignalInfo	[6] IMPLICIT ExternalSignalInfo OPTIONAL}
 
--- If available from the network the ISDN High Layer Compatibility information element is,
--- included as the value of the networkSignalInfo element 
+-- If available from the network the ISDN High Layer Compatibility information element is
+-- carried in the networkSignalInfo parameter as shown in section 6.4.3.8.9.
+-- The information is passed according to the rules specified in GSM 09.07.
 
 RESULT
 	roamingNumber	IsdnAddressString
 
+ERRORS
 	{AbsentSubscriber,
 	NoRoamingNumberAvailable,
 	FacilityNotSupported,
@@ -449,6 +518,7 @@ RESULT
 	DataMissing,
 	UnexpectedDataValue}
 --
+CompleteCall ::= OPERATION
 PARAMETER	SEQUENCE{
 	msIsdn		[0] IMPLICIT IsdnAddressString,
 	category		[1] IMPLICIT Category OPTIONAL,
@@ -456,6 +526,7 @@ PARAMETER	SEQUENCE{
 	gSM-BearerCapability	[3] IMPLICIT ExternalSignalInfo OPTIONAL,
 	noReplyConditionTime	[4] IMPLICIT NoReplyConditionTime OPTIONAL,
 	ss-DataList		[5] IMPLICIT SS-DataList OPTIONAL}
+
 ERRORS
 	{NoSubscriberReply,
 	RadioCongestion,
@@ -463,13 +534,16 @@ ERRORS
 	DataMissing,
 	UnexpectedDataValue}
 --
+ConnectToFollowingAddress ::= OPERATION
 PARAMETER	SEQUENCE{
 	forwardingData	ForwardingData,
 	msIsdn 		IsdnAddressString OPTIONAL}
 --
 ProcessCallWaiting ::= OPERATION
- 
--- Paging 
+
+
+-- Paging
+--
 Page ::= OPERATION
 PARAMETER	SEQUENCE{
 	imsi		[0] IMPLICIT IMSI,
@@ -477,6 +551,7 @@ PARAMETER	SEQUENCE{
 	locAreaId		[2] IMPLICIT LocAreaId}
 
 
+ERRORS
 	{AbsentSubscriber,
 	UnknownLocArea,
 	BusySubscriber,
@@ -484,13 +559,15 @@ PARAMETER	SEQUENCE{
 	UnexpectedDataValue}
 
 
+--
 SearchForMobileSubscriber ::= OPERATION
 PARAMETER	SEQUENCE{
 	imsi		IMSI,
 	storedLocationArea	CHOICE {
-				LocAreaId, 
+				LocAreaId,
 				NULL}}
 
+RESULT
 	currentLocAreaId	LocAreaId
 
 
@@ -498,15 +575,17 @@ ERRORS
 	{AbsentSubscriber,
 	BusySubscriber,
 	SystemFailure,
+	UnexpectedDataValue}
 
 --
- 
- 
+
+
 -- Handover
 
 PerformHandover ::= OPERATION
 PARAMETER	SEQUENCE{
 	targetCellId		GlobalCellId,
+	servingCellId	GlobalCellId,
 	channelType	ChannelType,
 	classmarkInformation	ClassmarkInformation,
 	handoverPriority 	[11] IMPLICIT HandoverPriority OPTIONAL,
@@ -514,6 +593,7 @@ PARAMETER	SEQUENCE{
 
 RESULT		SEQUENCE{
 	handoverNumber	IsdnAddressString,
+	accessSignalInfo	ExternalSignalInfo}
 	-- protocolId for ExternalSignalInfo
 	-- should indicate "gsm-04.08-version1"
 
@@ -521,6 +601,7 @@ ERRORS
 	{UnknownBaseStation,
 	InvalidTargetBaseStation,
 	NoRadioResourceAvailable,
+	NoHandoverNumberAvailable,
 	SystemFailure,
 	UnexpectedDataValue}
 
@@ -528,6 +609,7 @@ ERRORS
 --
 SendEndSignal ::= OPERATION
 
+RESULT
 
 
 --
@@ -535,6 +617,7 @@ PerformSubsequentHandover ::= OPERATION
 PARAMETER	SEQUENCE{
 	targetCellId		GlobalCellId,
 	servingCellId	GlobalCellId,
+	targetMscNumber	IsdnAddressString,
 	classmarkInformation	[10] IMPLICIT ClassmarkInformation OPTIONAL}
 
 RESULT
@@ -542,13 +625,16 @@ RESULT
 -- protocolId should indicate "gsm-04.08-version1"}
 
 
+ERRORS
 	{UnknownBaseStation,
 	InvalidTargetBaseStation,
 	UnknownMSC,
 	SubsequentHandoverFailure,
 	UnexpectedDataValue}
- 
+
+
 --
+AllocateHandoverNumber ::= OPERATION
 
 ERRORS
 	{NoHandoverNumberAvailable}
@@ -556,6 +642,7 @@ ERRORS
 LINKED
 	{SendHandoverReport}
 
+
 --
 SendHandoverReport ::= OPERATION
 PARAMETER
@@ -563,6 +650,7 @@ PARAMETER
 
 RESULT
 
+
 --
 ProcessAccessSignalling ::= OPERATION
 PARAMETER
@@ -571,20 +659,24 @@ PARAMETER
 
 
 
+
 --
 ForwardAccessSignalling ::= OPERATION
 PARAMETER
 	bss-APDU		ExternalSignalInfo
 -- protocolId should indicate "gsm-0806-version1"
 
- 
+
+
+
 -- Charging
 --
 RegisterChargingInformation ::= OPERATION
 PARAMETER	SEQUENCE{
 	msIsdn		IsdnAddressString,
-	mscNumber	IsdnAddressString,
+	mscNumber		IsdnAddressString,
 	imsi		IMSI,
+	callReference	CallReference,
 	callType		CallType,
 	callStatus		CallStatus,
 	callDateTime	CallDateTime,
@@ -592,20 +684,24 @@ PARAMETER	SEQUENCE{
 	bearerServiceCode	[10] IMPLICIT BearerServiceCode OPTIONAL,
 	teleserviceCode 	[11] IMPLICIT TeleserviceCode OPTIONAL,
 	calledNumber 	[12] IMPLICIT IsdnAddressString OPTIONAL,
+	callingNumber	[13] IMPLICIT IsdnAddressString OPTIONAL,
 	packetDataVolume	[14] IMPLICIT PacketDataVolume OPTIONAL,
-	chargingUnit	[15] IMPLICIT ChargingUnit OPTIONAL,
+	chargingUnit		[15] IMPLICIT ChargingUnit OPTIONAL,
 	charge		[16] IMPLICIT Charge OPTIONAL,
 	ss-ChargingInfo	[17] IMPLICIT SS-ChargingInfo OPTIONAL}
 
 RESULT
 
+ERRORS
 	{UnknownSubscriber,
 	DataMissing,
 	UnexpectedDataValue}
 
 
- 
+
+
 -- Fault recovery
+--
 Reset ::= OPERATION
 PARAMETER	SEQUENCE{
 	networkResource	NetworkResource,
@@ -613,27 +709,31 @@ PARAMETER	SEQUENCE{
 	hlrId		HlrList OPTIONAL}
 
 
+--
 
 ForwardCheckSsIndication ::= OPERATION
 
- 
- 
+
+
 -- Tracing
 --
+ActivateTraceMode ::= OPERATION
 PARAMETER	SEQUENCE{
 	imsi		[0] IMPLICIT IMSI OPTIONAL,
 	traceReference	[1] IMPLICIT TraceReference ,
 	traceType		[2] IMPLICIT TraceType,
-	omcId 		[3] IMPLICIT AddressString OPTIONAL} 
+	omcId 		[3] IMPLICIT AddressString OPTIONAL}
 
 RESULT	
 
+
 ERRORS
 	{UnidentifiedSubscriber,
 	FacilityNotSupported,
 	TracingBufferFull,
 	SystemFailure,
 	DataMissing,
+	UnexpectedDataValue}
 
 --
 DeactivateTraceMode ::= OPERATION
@@ -641,6 +741,7 @@ PARAMETER	SEQUENCE{
 	imsi		[0] IMPLICIT IMSI OPTIONAL,
 	traceReference	[1] IMPLICIT TraceReference}
 
+RESULT
 
 ERRORS
 	{UnidentifiedSubscriber,
@@ -649,12 +750,14 @@ ERRORS
 	DataMissing,
 	UnexpectedDataValue}
 
+
 --
 TraceSubscriberActivity ::= OPERATION
 PARAMETER	SEQUENCE{
 	imsi		[0] IMPLICIT IMSI OPTIONAL,
 	traceReference	[1] IMPLICIT TraceReference,
 	traceType		[2] IMPLICIT TraceType,
+	omcId 		[3] IMPLICIT AddressString OPTIONAL,
 	callReference	[4] IMPLICIT CallReference OPTIONAL}
 
 --
@@ -662,14 +765,16 @@ NoteInternalHandover ::= OPERATION
 
 PARAMETER	SEQUENCE{
 	handoverType	HandoverType,
+	targetCellId		[1] IMPLICIT GlobalCellId OPTIONAL,
 	channelId		[2] IMPLICIT ExternalSignalInfo OPTIONAL}
- 
- 
+
+
 -- Equipment management
 --
 CheckIMEI ::= OPERATION
 PARAMETER
 	imei		IMEI
+
 RESULT
 	equipStatus		EquipStatus
 
@@ -677,14 +782,17 @@ ERRORS
 	{UnknownEquipment,
 	SystemFailure,
 	UnexpectedDataValue}
- 
- 
+
+
+
+
 -- Authentication and security
 --
 Authenticate ::= OPERATION
 PARAMETER	SEQUENCE{
 	rand		Rand,
 	cksn		CKSN}
+
 RESULT
 	sres		Sres
 
@@ -692,13 +800,16 @@ RESULT
 
 --
 ProvideIMSI ::= OPERATION
+
 RESULT
 	imsi		IMSI
 
 ERRORS
 	{AbsentSubscriber}
 
- 
+
+
+--
 ForwardNewTMSI ::= OPERATION
 PARAMETER
 	tmsi		TMSI
@@ -706,13 +817,16 @@ PARAMETER
 RESULT
 
 --
+SetCipheringMode ::= OPERATION
 PARAMETER	SEQUENCE{
 	cipheringMode	CipheringMode,
 	kc		Kc OPTIONAL}
--- Kc should be included when cipheringMode indicates 
+-- Kc should be included when cipheringMode indicates
 -- that ciphering must be performed
- 
+
+
 -- Short messages
+
 SendRoutingInfoForSM ::= OPERATION
 PARAMETER	SEQUENCE{
 	msIsdn		[0] IMPLICIT IsdnAddressString,
@@ -720,6 +834,7 @@ PARAMETER	SEQUENCE{
 	serviceCentreAddress	[2] IMPLICIT AddressString,
 	cug-Interlock	[3] IMPLICIT CUG-Interlock OPTIONAL,
 	teleserviceCode	[5] IMPLICIT TeleserviceCode OPTIONAL}
+
 RESULT		SEQUENCE{
 	imsi		IMSI,
 			CHOICE{
@@ -727,20 +842,23 @@ RESULT		SEQUENCE{
 	locationInfo				LocationInfo,
 	lMsId				LMsId OPTIONAL},
 	forwardingData		[1] IMPLICIT ForwardingData},
+	mwd-Set			[2] IMPLICIT BOOLEAN OPTIONAL}
 
 ERRORS
 	{UnknownSubscriber,
 	CallBarred,
 	CUG-Reject,
 	TeleServiceNotProvisioned,
-	AbsentSubscriber, 
+	AbsentSubscriber,
+	FacilityNotSupported,
 	SystemFailure,
-	DataMissing, 
+	DataMissing,
 	UnexpectedDataValue}
- 
- 
--- 
+
+
+--
 ForwardShortMessage ::= OPERATION
+PARAMETER	SEQUENCE{
 	sm-RP-DA		SM-RP-DA,
 	sm-RP-OA		SM-RP-OA,
 	sm-RP-UI		SM-RP-UI}
@@ -748,6 +866,7 @@ ForwardShortMessage ::= OPERATION
 RESULT
 
 ERRORS
+	{UnidentifiedSubscriber,
 	AbsentSubscriber,
 	FacilityNotSupported,
 	IllegalMS,
@@ -755,6 +874,7 @@ ERRORS
 	UnexpectedDataValue,
 	SM-DeliveryFailure}
 
+--
 SetMessageWaitingData ::= OPERATION
 PARAMETER	SEQUENCE{
 	msIsdn		IsdnAddressString,
@@ -762,6 +882,7 @@ PARAMETER	SEQUENCE{
 
 RESULT
 
+
 ERRORS
 	{UnknownSubscriber,
 	MessageWaitingListFull,
@@ -769,6 +890,7 @@ ERRORS
 
 
 --
+NoteMSPresent ::= OPERATION
 
 PARAMETER
 	imsi		IMSI
@@ -776,26 +898,31 @@ PARAMETER
 
 --
 AlertServiceCentre ::= OPERATION
+PARAMETER	SEQUENCE{
 	msIsdn		IsdnAddressString,
 	serviceCentreAddress	AddressString}
 
 
- 
+
+
 -- Access request
+--
 ProcessAccessRequest ::= OPERATION
 PARAMETER	SEQUENCE{
 	subscriberId		SubscriberId,
-	cmServiceType		CmServiceType,
-	accessConnectionStatus	AccessConnectionStatus, 
-	cksn			CKSN}
+	cmServiceType	CmServiceType,
+	accessConnectionStatus	AccessConnectionStatus,
+	cksn		CKSN}
 
-	imsi 		IMSI, 
+RESULT		SEQUENCE{
+	imsi 		IMSI,
 	msIsdn 		IsdnAddressString OPTIONAL}
 
 ERRORS
 	{IllegalMS,
 	UnknownSubscriber,
 	UnidentifiedSubscriber,
+	SystemFailure,
 	UnexpectedDataValue }
 
 
@@ -803,37 +930,43 @@ ERRORS
 --
 BeginSubscriberActivity ::= OPERATION
 PARAMETER	SEQUENCE{
+	imsi		IMSI,
 	originatingEntityNumber	IsdnAddressString}
 
 
 
 
 END   -- End of operation types definitions --
- 
-MAP-Errors DEFINITIONS ::= 
+
+
+MAP-Errors DEFINITIONS ::=
 
 BEGIN
 
+
 EXPORTS
 UnknownSubscriber, UnknownBaseStation,UnknownMSC,
 UnknownLocArea, UnidentifiedSubscriber,
 UnallocatedRoamingNumber, UnknownEquipment, RoamingNotAllowed,
 IllegalMS, BearerServiceNotProvisioned,
 TeleserviceNotProvisioned, InsufficientBearerCapabilities,
+CallBarred, ForwardingViolation, CUG-Reject,
 IllegalSS-Operation, SS-ErrorStatus, SS-NotAvailable,
 SS-SubscriptionViolation, SS-Incompatibility, FacilityNotSupported, InvalidTargetBaseStation,
 NoRadioResourceAvailable, NoHandoverNumberAvailable,
-SubsequentHandoverFailure, 
+SubsequentHandoverFailure,
 AbsentSubscriber, BusySubscriber, NoSubscriberReply,
 RadioCongestion, ImpossibleCallCompletion, SM-DeliveryFailure,
 MessageWaitingListFull, SystemFailure, DataMissing,
+UnexpectedDataValue, PasswordRegistrationFailure,
 NegativePasswordCheck, NoRoamingNumberAvailable,
 TracingBufferFull;
 
-IMPORTS 
+IMPORTS
 ERROR FROM TCAPMessages {ccitt recommendation q 773 moduleA(0)}
 
-SS-Code, SS-CodeList, SS-Status, SS-SubscriptionOption, BasicServiceCode, 
+SS-Code, SS-CodeList, SS-Status, SS-SubscriptionOption, BasicServiceCode,
+NetworkResource FROM MAP-DataTypes;
 
 
 -- error types definitions
@@ -841,13 +974,15 @@ SS-Code, SS-CodeList, SS-Status, SS-SubscriptionOption, BasicServiceCode,
 UnknownSubscriber ::= ERROR
 
 UnknownBaseStation ::= ERROR
+
 UnknownMSC ::= ERROR
 
 UnknownLocArea ::= ERROR
- 
- 
+
+
 UnidentifiedSubscriber ::= ERROR
 
+UnallocatedRoamingNumber ::= ERROR
 
 UnknownEquipment ::= ERROR
 
@@ -855,6 +990,7 @@ RoamingNotAllowed ::= ERROR
 
 IllegalMS ::= ERROR
 
+BearerServiceNotProvisioned ::= ERROR
 
 TeleServiceNotProvisioned ::= ERROR
 
@@ -862,20 +998,23 @@ InsufficientBearerCapabilities ::= ERROR
 
 CallBarred ::= ERROR
 PARAMETER
+	cause ENUMERATED {
 		barringServiceActive (0),
 		operatorBarring (1)} -- optional
 
--- 
+--
 ForwardingViolation ::= ERROR
 
--- 
+--
+CUG-Reject ::= ERROR
 PARAMETER
 	cause ENUMERATED {
 		incomingCallBarred(0),
 		nonCUGmember (1)} -- optional
 
--- 
+--
 IllegalSS-Operation ::= ERROR
+
 --
 SS-ErrorStatus ::= ERROR
 PARAMETER
@@ -883,12 +1022,15 @@ PARAMETER
 
 --
 SS-NotAvailable ::= ERROR
+
 SS-SubscriptionViolation ::= ERROR
 PARAMETER	
 	ss-SubscriptionOption SS-SubscriptionOption -- optional
 
- 
+
+
 --
+SS-Incompatibility ::= ERROR
 PARAMETER 		SEQUENCE{
 	ss-Code		[1] IMPLICIT SS-Code OPTIONAL,
 	basicService 	BasicServiceCode OPTIONAL,
@@ -896,6 +1038,7 @@ PARAMETER 		SEQUENCE{
 
 --
 FacilityNotSupported ::= ERROR
+
 --
 InvalidTargetBaseStation ::= ERROR
 
@@ -903,6 +1046,7 @@ NoRadioResourceAvailable ::= ERROR
 
 NoHandoverNumberAvailable ::= ERROR
 
+
 SubsequentHandoverFailure ::= ERROR
 
 
@@ -910,6 +1054,7 @@ AbsentSubscriber ::= ERROR
 PARAMETER	
 	mwd-Set		BOOLEAN -- optional
 
+BusySubscriber ::= ERROR
 
 NoSubscriberReply ::= ERROR
 
@@ -917,6 +1062,7 @@ RadioCongestion ::= ERROR
 
 ImpossibleCallCompletion ::= ERROR
 PARAMETER		
+	activeSupplServices	SS-CodeList -- optional
 
 SM-DeliveryFailure ::= ERROR
 PARAMETER
@@ -924,13 +1070,16 @@ PARAMETER
 		msProtocolError (1),
 		msNotEquiped (2),
 		unknownServiceCentre (3),
+		scCongestion (4),
 		invalidSmeAddress (5),
-		msNotScSubscriber (6)} 
+		msNotScSubscriber (6)}
 
 MessageWaitingListFull ::= ERROR
 
- 
+
+
 --
+SystemFailure ::= ERROR
 PARAMETER	NetworkResource -- optional
 
 DataMissing ::= ERROR
@@ -938,6 +1087,7 @@ DataMissing ::= ERROR
 UnexpectedDataValue ::= ERROR
 
 PasswordRegistrationFailure ::= ERROR
+PARAMETER	
 	diagnostic  ENUMERATED{undetermined (0),
 		invalidFormat (1),
 		newPasswordsMismatch (2)}
@@ -945,49 +1095,57 @@ PasswordRegistrationFailure ::= ERROR
 
 NegativePasswordCheck ::= ERROR
 
+NoRoamingNumberAvailable ::= ERROR
 
 TracingBufferFull ::= ERROR
 
 
 END  -- End of error types definitions
- MAP-Constants DEFINITIONS ::= 
+
+MAP-Constants DEFINITIONS ::=
 
 BEGIN
 
+EXPORTS
 
-maxSignalInfoLength, 
-maxNumberOfTeleServices ,
+maxSignalInfoLength,
+maxNumberOfTeleServices,
 maxNumberOfBearerServices,
-maxNumberOfSupplServices, 
+maxNumberOfSupplServices,
 
-maxNumberOfCUG, 
+maxNumberOfCUG,
+maxNumberOfBasicServices,
 maxNumberOfForwardingFeatures,
 maxNumberOfCallBarringFeatures,
-maxNumberOfHlrId, 
-maxPacketDataVolume, 
+maxNumberOfHlrId,
+maxPacketDataVolume,
 maxNumberOfChargingUnit,
 maxCallDuration,
 maxAddressLength,
+maxNumberOfSentParameters;
 
--- value assignement
+-- value assignment
 
 maxSignalInfoLength INTEGER  ::= 200
--- this NamedValue represent the theoretical maximum number 
+-- this NamedValue represent the theoretical maximum number
 -- of octets which available to carry a single data type, without
 -- requiring segmentation to cope with the network layer service.
+-- However the actual maximum size available for a data type
 -- may be lower, especially when other information elements have
 -- to be included in the same component
- 
- 
+
+
 -- value assignment continuation
 
 maxNumberOfTeleservices 		INTEGER ::=  20
 maxNumberOfBearerServices 		INTEGER ::=  50
 maxNumberOfSupplServices 		INTEGER ::=  30
+
 maxNumberOfCUG			INTEGER ::=  10
 maxNumberOfBasicServices 		INTEGER ::=  70
-maxNumberOfForwardingFeatures 	INTEGER ::=  13
-maxNumberOfCallBarringFeatures 	INTEGER ::=  13
+maxNumberOfForwardingFeatures		INTEGER ::=  13
+maxNumberOfCallBarringFeatures 		INTEGER ::=  13
+maxNumberOfHlrId			INTEGER ::=  50
 maxPacketDataVolume 		INTEGER ::= 100
 maxNumberOfChargingUnit 		INTEGER ::= 16777215
 maxCallDuration 			INTEGER ::= 16777215
@@ -995,23 +1153,28 @@ maxAddressLength 			INTEGER ::=  20
 
 maxNumberOfSentParameters 		INTEGER ::=  10
 -- this named value should correspond to the maximum of
+-- the maxNumberOfCUG and the maximum number of authentication
 -- set which may be returned by a HLR plus 1.
 END
- 
+
+ExternalSignalInfo ::=  SEQUENCE{
 		protocolId    ProtocolId,
 		signalInfo  SignalInfo}
 
 maxExternalInfoLength INTEGER  ::= 200
 
-Signal ::= OCTET STRING (SIZE (1..maxExternalInfoLength))
+SignalInfo ::= OCTET STRING (SIZE (1..maxExternalInfoLength))
 
+ProtocolId    ::= ENUMERATED{
 		gsm-0408		(1),
 		gsm-0806		(2),
 		gsm-0808-bssmap	(3),
-		isup-Q763		(4)}
+		ets300102-1		(4)}
 		
 
-MAP-DataTypes   DEFINITIONS ::= 
+
+MAP-DataTypes   DEFINITIONS ::=
+
 BEGIN
 
 -- exports all data types defined in this module
@@ -1019,17 +1182,20 @@ BEGIN
 IMPORTS
 -- imports upper boundaries for data types
 
-maxNumberOfBearerServices, maxNumberOfSupplServices, 
-maxNumberOfCUG, maxNumberOfBasicServices, 
+maxSignalInfoLength, maxNumberOfTeleServices,
+maxNumberOfBearerServices, maxNumberOfSupplServices,
+maxNumberOfCUG, maxNumberOfBasicServices,
 maxNumberOfForwardingFeatures, maxNumberOfCallBarringFeatures,
-maxNumberOfHlrId, maxPacketDataVolume, 
+maxNumberOfHlrId, maxPacketDataVolume,
+maxNumberOfChargingUnit, maxCallDuration,
 maxAddressLength, maxNumberOfSentParameters
 FROM MAP-Constants;
 
 -- common data types
 
 TBCD-STRING	 ::= OCTET STRING
-		-- digits 0 through 9, two digits per octet, 
+		-- digits 0 through 9, two digits per octet,
+		-- each digit encoded 0000 to 1001,
 		-- 1111 used as filler when there is an odd number of digit.
 
 
@@ -1037,6 +1203,7 @@ AddressString	 ::= OCTET STRING (SIZE (1..maxAddressLength))
 		-- see internal description in section 6.4.1
 
 IsdnAddressString	 ::= AddressString (SIZE (1..10))
+
 ExternalSignalInfo	 ::= SEQUENCE{
 			protocolId	ProtocolId,
 			signalInfo	SignalInfo}
@@ -1044,13 +1211,15 @@ ExternalSignalInfo	 ::= SEQUENCE{
 SignalInfo	 ::= OCTET STRING (SIZE (1..maxSignalInfoLength))
 
 ProtocolId	 ::= ENUMERATED{
+		gsm-0408		(1),
 		gsm-0806		(2),
 		gsm-0808-bssmap	(3),
-		isup-Q763		(4)}
- 
- 
+		ets300102-1		(4)}
+
+
 -- data types for numbering and identification
 
+IMSI	 ::= TBCD-STRING (SIZE (2..8))
 		-- MCC, MNC, MSIN concatenated in this order
 
 TMSI	 ::= OCTET STRING (SIZE (1..4))
@@ -1058,27 +1227,31 @@ TMSI	 ::= OCTET STRING (SIZE (1..4))
 
 SubscriberId	 ::= CHOICE {
 		imsi	[0] IMPLICIT IMSI,
+		tmsi	[1] IMPLICIT TMSI}
 
 --
 IMEI	 ::= TBCD-STRING (SIZE (8))
-		-- Internal Structure 
+		-- Internal Structure
 		-- Type Approval Code : 6 digits
-		-- manufacturer place : 2 digits 
+		-- manufacturer place : 2 digits
 		-- individual serial number : 6 digits
+		-- unassigned : 1 digit
 
 LocAreaId	 ::= OCTET STRING (SIZE (2..5))
 		-- Octets coded according to
 		-- Recommendation GSM 04.08
-		-- Internal structure 
+		-- Internal structure
 		-- Mobile Country Code	: 3 digits according to Rec E.212
 		--		: 1 filler (1111)
-		-- Location Area Code	: 2 octets  according to GSM 04.08 
+		-- Mobile Network Code	: 2 digits according to Rec E.212
+		-- Location Area Code	: 2 octets according to GSM 04.08
 
 LocationInfo	 ::= CHOICE {
 		roamingNumber	[0] IMPLICIT IsdnAddressString,
-		mscNumber	[1] IMPLICIT IsdnAddressString}
+		mscNumber		[1] IMPLICIT IsdnAddressString}
 
 HlrId	 ::= IMSI
+		-- leading digits of IMSI
 
 HlrList	 ::= SEQUENCE 
 		     SIZE(1.. maxNumberOfHlrId) OF HlrId
@@ -1087,22 +1260,26 @@ HlrList	 ::= SEQUENCE
 LMsId	 ::= OCTET STRING (SIZE (4))
 
 
-		-- Octets coded according to 
+GlobalCellId	 ::= OCTET STRING (SIZE (5..7))
+		-- Octets coded according to
 		-- Recommendation GSM 04.08
-		-- Internal structure 
+		-- Internal structure
 		-- Mobile Country Code	: 3 digits according to Rec E.212
 		--		: 1 filler (1111)
-		-- Mobile Network Code	: 2 digits  according to Rec E.212 
+		-- Mobile Network Code	: 2 digits according to Rec E.212
 		-- Location Area Code	: 2 octets (LAC) according 
 		-- to GSM 04.08
- 
+		-- Cell identity	: 2 octets (CI) according to GSM 04.08
+
+
 -- data types for subscriber management
- 
+
 --
 Category	 ::= OCTET STRING (SIZE (1))
 		-- internal structure defined in CCITT Rec Q.763
 
 EquipStatus	 ::= ENUMERATED {
+		white-listed	(0),
 		black-listed	(1),
 		grey-listed	(2)}
 
@@ -1110,6 +1287,7 @@ EquipStatus	 ::= ENUMERATED {
 BearerServiceCode	 ::= OCTET STRING (SIZE (1))
 		-- Internal structure according to table 6.4/1
 		-- BIT 8 Transparency indicator (if applicable)
+		--     0 transparent
 		--     1 non transparent
 
 		-- BIT 7654  Bearer service group
@@ -1117,6 +1295,7 @@ BearerServiceCode	 ::= OCTET STRING (SIZE (1))
 		--    0010 Circuit data asynchronous
 		--    0011 Circuit data synchronous
 		--    0100 PAD access c.d.a
+		--    0101 Packet data synchrounous
 		--    0110 Alternate speech/c.d.a
 		--    0111 Alternate speech c.d.s
 		--    1000 Speech followed by data c.d.a
@@ -1124,27 +1303,31 @@ BearerServiceCode	 ::= OCTET STRING (SIZE (1))
 		--    1111 12.6 kb/s unrestricted digital
 
 		-- BIT 321  Rate (when applicable)
+		--    000 Any
 		--    001 300-300 b/s
-		--    010 1200-1200b/s
-		--    011 1200-75b/s
-		--    100 2400-2400b/s
-		--    101 4800-4800b/s
-		--    110 9600-9600b/s
+		--    010 1200-1200 b/s
+		--    011 1200-75 b/s
+		--    100 2400-2400 b/s
+		--    101 4800-4800 b/s
+		--    110 9600-9600 b/s
+
 
-		-- Bits 321 = 000 can be used to refer to all 
+		-- Bits 321 = 000 can be used to refer to all
 		-- the bearer services of the corresponding group.
-		-- Value "00000000" can be used to refer to all the defined 
+		-- Value "00000000" can be used to refer to all the defined
 		-- bearer services.
 		-- For the codes referring to a group or all bearer services
 		-- the Transparency Indicator is not applicable and has to be set to "0"
 
-BearerServiceList	 ::= SEQUENCE 
+
+BearerServiceList	 ::= SEQUENCE
 		     SIZE(1 .. maxNumberOfBearerServices)
 		     OF BearerServiceCode
- 
+
 
 BearerServiceCode
 
+7564321		Meaning			
 0000000		All bearer services
 
 0001000		3.1 Khz group
@@ -1153,40 +1336,41 @@ BearerServiceCode
 0001011		speech followed by 3.1 Khz
 
 0010000		Data c.d.a
-0010001		Data c.d.a 300b/s
-0010010		Data c.d.a 1200b/s
-0010011		Data c.d.a 1200-75b/s
-0010100		Data c.d.a 2400b/s
-0010101		Data c.d.a 4800b/s
-0010110		Data c.d.a 9600b/s
+0010001		Data c.d.a 300 b/s
+0010010		Data c.d.a 1200 b/s
+0010011		Data c.d.a 1200-75 b/s
+0010100		Data c.d.a 2400 b/s
+0010101		Data c.d.a 4800 b/s
+0010110		Data c.d.a 9600 b/s
 
 0011000		Data c.d.s
-0011010		Data c.d.s 1200b/s
-0011100		Data c.d.s 2400b/s
-0011101		Data c.d.s 4800b/s
-0011110		Data c.d.s 9600b/s
+0011010		Data c.d.s 1200 b/s
+0011100		Data c.d.s 2400 b/s
+0011101		Data c.d.s 4800 b/s
+0011110		Data c.d.s 9600 b/s
 
 0100000		PAD access c.d.a
-0100001		PAD access c.d.a 300b/s
-0100010		PAD access c.d.a 1200b/s
-0100011		PAD access c.d.a 1200-75b/s
-0100100		PAD access c.d.a 2400b/s
-0100101		PAD access c.d.a 4800b/s
-0100110		PAD access c.d.a 9600b/s
+0100001		PAD access c.d.a 300 b/s
+0100010		PAD access c.d.a 1200 b/s
+0100011		PAD access c.d.a 1200-75 b/s
+0100100		PAD access c.d.a 2400 b/s
+0100101		PAD access c.d.a 4800 b/s
+0100110		PAD access c.d.a 9600 b/s
 
 0101000		Data p.d.s
-0101100		Data p.d.s 2400b/s
-0101101		Data p.d.s 4800b/s
-0101110		Data p.d.s 9600b/s
+0101100		Data p.d.s 2400 b/s
+0101101		Data p.d.s 4800 b/s
+0101110		Data p.d.s 9600 b/s
 
-0110000		Alternate speech/ data c.d.a
+0110000		Alternate speech/data c.d.a
 0111000		Alternate speech/data c.d.s
 
 1000000		Speech followed by data c.d.a
-1001000		Speech follwoed by data c.d.s
+1001000		Speech followed by data c.d.s
 
 1111000		12 kb/s Unrestricted Digital
 
+TeleServiceCode
 
 Contents		Meaning			
 00000000		All teleservices
@@ -1213,27 +1397,30 @@ Contents		Meaning
 
 01100000		Facsimile 
 01100001		Facsimile Group 3 and alternate speech
-01100010		Automatic Facimile Group 3
+01100010		Automatic Facsimile Group 3
+
 
- 
 TeleserviceCode	 ::= OCTET STRING (SIZE (1))
 		-- Internal structure according to table 6.4/2
 		-- Bit 8-5 encode the teleservice group
 
-		-- teleservices  of the corresponding group.
+		-- Bit 4-1 = 0000 can be used to refer to all the
+		-- teleservices of the corresponding group.
 		-- Value "00000000" can be used to refer to all the defined
 		-- teleservices
 
-TeleserviceList	 ::= SEQUENCE 
+TeleserviceList	 ::= SEQUENCE
 		     SIZE(1 .. maxNumberOfTeleservices)
 		     OF TeleserviceCode
 
+
 BasicServiceCode	 ::= CHOICE {
 		bearerService	[2] IMPLICIT BearerServiceCode,
 		teleservice		[3] IMPLICIT TeleserviceCode}
 
-BasicServiceList	 ::= SEQUENCE 
+BasicServiceList	 ::= SEQUENCE
 		     SIZE(1 .. maxNumberOfBasicServices)
+		     OF BasicServiceCode
 
 --
 SubscriberStatus	 ::= ENUMERATED{
@@ -1241,6 +1428,8 @@ SubscriberStatus	 ::= ENUMERATED{
 		operatorOGCallBarring	(1)}
 
 
+SS-Code
+
 Contents		Meaning			
 00010001		Calling number identification presentation
 00010010		Calling number identification restriction
@@ -1259,7 +1448,7 @@ Contents		Meaning
 01000011		Completion of calls to busy subscribers
 01010001		Three party service
 01010010		Conference calling
-01100001		Closed user groupe
+01100001		Closed user group
 01110001		Advice of charge
 01110010		Freephone service
 01110011		Reverse charging
@@ -1272,33 +1461,37 @@ Contents		Meaning
 10011001		Barring of incoming calls
 10011010		Barring of all incoming calls
 10011011		Barring of all IC calls when outside HPLMN
- 
+
 -- Data types for supplementary services
 
 SS-Code	 ::= OCTET STRING (SIZE(1))
-		-- Internal strucure according to 
-		-- table 6.4/3 
-		-- 0001 Number Identification services 
-		-- 0010 Forwarding services 
-		-- 0011 Call offering services 
-		-- 0100 Call completion services 
-		-- 0101 Multi-party services 
-		-- 0110 Community of interest services 
-		-- 0111 Charging services 
-		-- 1001 Call restriction services 
-		-- Bit 4-1 = 0000 can be use to refer to 
-		-- a group of supplementary services 
-		-- eg, "00100000" can be used to refer to all 
-		-- forwarding services 
-		-- "00101000" can be used to refer to all  
-		-- conditional forwarding services 
+		-- Internal structure according to
+		-- table 6.4/3
+		-- Bit 8-5
+		-- 0001 Number Identification services
+		-- 0010 Forwarding services
+		-- 0011 Call offering services
+		-- 0100 Call completion services
+		-- 0101 Multi-party services
+		-- 0110 Community of interest services
+		-- 0111 Charging services
+		-- 1000 Additional information transfer services
+		-- 1001 Call restriction services
+		-- Bit 4-1 = 0000 can be use to refer to
+		-- a group of supplementary services
+		-- eg, "00100000" can be used to refer to all
+		-- forwarding services
+		-- "00101000" can be used to refer to all
+		-- conditional forwarding services
+		-- "00000000" can be used to refer to all
 		-- supplementary services
 
-SS-CodeList	 ::= SEQUENCE 
+SS-CodeList	 ::= SEQUENCE
 		     SIZE(1 .. maxNumberOfSupplServices)
 		     OF SS-Code
 
 
+SS-Status	 ::= OCTET STRING (SIZE (1))
 		-- Bit 8-4 Unused
 		-- Bit 3   Provision indicator
 		--     0 : Not provisioned
@@ -1306,6 +1499,7 @@ SS-CodeList	 ::= SEQUENCE
 		-- Bit 2   Registration indicator (if applicable)
 		--     0 : Not Registered
 		--     1 : Registered
+		-- Bit 1   Activation indicator (If applicable)
 		--     0 : Not Active
 		--     1 : Active
 
@@ -1313,19 +1507,23 @@ SS-Information	 ::= CHOICE{
 		forwardingInfo	[0] IMPLICIT ForwardingInfo,
 		callBarringInfo	[1] IMPLICIT CallBarringInfo,
 		cug-Information	[2] IMPLICIT CUG-Information,
+		ss-Data		[3] IMPLICIT SS-Data}
 
-SS-InfoList	 ::= SEQUENCE 
+SS-InfoList	 ::= SEQUENCE
 		     SIZE(1 .. maxNumberOfSupplServices)
-		     OF SS-Information 
- 
+		     OF SS-Information
+
+
 --
+SS-Data	 ::= SEQUENCE{
 	ss-Code		SS-Code,
 	ss-Status		[4] IMPLICIT SS-Status OPTIONAL,
 	ss-SubscriptionOption	SS-SubscriptionOption OPTIONAL}
 
 
-SS-DataList	 ::= SEQUENCE 
+SS-DataList	 ::= SEQUENCE
 		     SIZE(1 .. maxNumberOfSupplServices)
+		     OF SS-Data
 
 
 SS-Request	 ::= ENUMERATED{
@@ -1333,13 +1531,15 @@ SS-Request	 ::= ENUMERATED{
 		erasure (1),
 		activation (2),
 		deactivation(3),
+		interrogation (4),
 		invoke (5)}
 
 
 SS-SubscriptionOption	 ::= CHOICE{
-	perCallBasis		[5] IMPLICIT BOOLEAN,
+	perCallBasis			[5] IMPLICIT BOOLEAN,
 	notificationToHeldRetrievedParty	[6] IMPLICIT BOOLEAN,
 	userToUserServiceIndicator	[7] IMPLICIT UserToUserServiceIndicator,
+	maximumConfereesNumber	[8] IMPLICIT MaximumConfereesNumber,
 	huntGroupAccessSelectionOrder	[9] IMPLICIT HuntGroupAccessSelectionOrder}
 
 
@@ -1347,6 +1547,7 @@ SS-SubscriptionOption	 ::= CHOICE{
 ForwardingOptions	 ::= OCTET STRING (SIZE(1))
 		-- Bit 8-7  Notification to forwarding party
 		--          00  No notification
+		--          01  notification with calling number identity
 		--          10  notification without calling number identity
 		-- Bit 6-5  Notification to calling party
 		--          00 No notification
@@ -1354,22 +1555,25 @@ ForwardingOptions	 ::= OCTET STRING (SIZE(1))
 		--          10 Notification without forwarded-to number
 
 
+UserToUserServiceIndicator	 ::= OCTET STRING (SIZE(1))
 		-- Bit 8   : service 1
 		-- Bit 7   : service 2
 		-- Bit 6   : service 3
 		-- Bit 5-1 : Reserved
-		-- Bit 8 to 6 coded "1" if the service 
+		-- Bit 8 to 6 coded "1" if the service
 		-- is available to the subscriber
 
+
 MaximumConfereesNumber	 ::= INTEGER (1..10)
 
- 
- 
+
+
 HuntGroupAccessSelectionOrder ::= ENUMERATED{
 		random	(0),
 		sequential	(1)}
 
 
+NoReplyConditionTime	 ::= INTEGER (5..30)
 
 
 
@@ -1377,20 +1581,23 @@ NumberOfConferees	 ::= INTEGER (1..10)
 
 
 CUG-Facilities	 ::=  OCTET STRING (SIZE (1))
-		-- Bit 2-1 
+		-- Bit 8-3 000000 (Unused)
+		-- Bit 2-1
 		--   00 CUG only facilities
 		--   01 CUG with outgoing access
 		--   10 CUG with incoming access
 		--   11 CUG with both outgoing and incoming access
 
 CUG-Interlock	 ::= OCTET STRING (SIZE (4))
+		-- Internal structure defined in Rec CCITT Q.763
 
 CUG-Index	 ::=  OCTET STRING (SIZE (1))
-		-- Internal structrure defined in Rec CCITT Q.763
+		-- Internal structure defined in Rec CCITT Q.763
 
 CUG-Options	 ::=  OCTET STRING (SIZE (1))
 		-- BIT 8-4 00000 (Unused)
 		-- BIT 3 preferential CUG indicator
+		-- 0 no preferential
 		-- 1 preferential CUG
 		-- BIT 2 barring of incoming calls within the CUG
 		-- 0 no barring
@@ -1398,21 +1605,24 @@ CUG-Options	 ::=  OCTET STRING (SIZE (1))
 		-- BIT 1 barring of outgoing calls within the CUG
 		-- 0 no barring
 		-- 1 barring
+
 CUG-Feature	 ::= SEQUENCE {
-	cug-interlock	CUG-Interlock,
+	cug-interlock		CUG-Interlock,
 	cug-Index		CUG-Index,
-	cug-Options	CUG-Options,
+	cug-Options		CUG-Options,
 	ss-Status		SS-Status}
 
 
+CUG-FeatureList ::= 	SEQUENCE SIZE (
 		1..maxNumberOfCUG) OF CUG-Feature
- 
- 
+
+
 CUG-Information	 ::= SEQUENCE{
 	cug-Facilities	CUG-Facilities,
 			CHOICE{
 	cug-Feature			[0] IMPLICIT CUG-Feature,
 	cug-FeatureList		[1] IMPLICIT CUG-FeatureList}}
+		-- the first alternative of the choice should be used
 		-- for the preferred CUG.
 
 --
@@ -1420,6 +1630,7 @@ ForwardingInfo	 ::= SEQUENCE{
 	ss-Code		SS-Code OPTIONAL,
 	forwardingFeatureList	ForwardingFeatureList}
 
+ForwardingData	 ::= SEQUENCE{
 	forwardedToNumber	[5] IMPLICIT IsdnAddressString,
 	forwardingOptions	[6] IMPLICIT ForwardingOptions OPTIONAL}
 
@@ -1427,18 +1638,21 @@ ForwardingInfo	 ::= SEQUENCE{
 ForwardingFeature	 ::=  SEQUENCE {
 	basicService	BasicServiceCode OPTIONAL,
 	ss-Status		[4] IMPLICIT SS-Status,
+	forwardedToNumber	[5] IMPLICIT IsdnAddressString OPTIONAL,
 	forwardingOptions	[6] IMPLICIT ForwardingOptions OPTIONAL,
 	noReplyConditionTime	[7] IMPLICIT NoReplyConditionTime  OPTIONAL}
 
 ForwardingFeatureList	 ::= SEQUENCE SIZE (1.. maxNumberOfForwardingFeatures) 
 	OF ForwardingFeature
+
 CallBarringInfo	 ::= SEQUENCE {
-	ss-Code	SS-Code,
+	ss-Code		SS-Code,
 	callBarringFeatureList	CallBarringFeatureList}
 
 CallBarringFeature	 ::= SEQUENCE{
 	basicServiceCode	BasicServiceCode OPTIONAL,
 	ss-Status		[4] IMPLICIT SS-Status }
+
 CallBarringFeatureList	 ::= SEQUENCE SIZE (1.. maxNumberOfCallBarringFeatures) 
 OF CallBarringFeature
 
@@ -1446,22 +1660,25 @@ SubscriberData	 ::= SEQUENCE{
 	msIsdn			[1] IMPLICIT IsdnAddressString OPTIONAL,
 	category			[2] IMPLICIT Category OPTIONAL,
 	subscriberStatus		[3] IMPLICIT SubscriberStatus OPTIONAL,
+	bearerServiceList		[4] IMPLICIT BearerServiceList OPTIONAL,
 	teleserviceList		[6] IMPLICIT TeleserviceList OPTIONAL, 	
-	provisonedSupplServices	[7] IMPLICIT SS-InfoList OPTIONAL}
- 
- 
+	provisonedSupplServices		[7] IMPLICIT SS-InfoList OPTIONAL}
+
+
 SS-Notification	 ::= OCTET STRING (SIZE (1))
 		-- 1 bit per defined indication
 
 
 Password	 ::= CHOICE {
+		PrintableString (SIZE(4..8)),
 		NumericString (FROM (
 		"0"|"1"|"2"|"3"|"4"|
 		"5"|"6"|"7"|"8"|"9")|
-		SIZE(4))} 
-		-- only the second form is used for GSM systems. 
+		SIZE(4))}
+		-- only the second form is used for GSM systems.
 
 
+GuidanceInfo	 ::=   ENUMERATED{
 		guidance0 (0),
 		guidance1 (1),
 		guidance2 (2),
@@ -1469,39 +1686,45 @@ Password	 ::= CHOICE {
 		guidance4 (4)}
 
 		-- the identifiers used in this description represent
+		-- the information which has to be delivered to the subscriber
 		-- according to table 6.4/4.
-		-- How this information is really delivered to the subscriber 
-		-- (display, annoucement, ...) is not part of this specification.
+		-- How this information is really delivered to the subscriber
+		-- (display, announcement, ...) is not part of this specification.
 
 SS-UserData	 ::= IA5String (SIZE (1.. maxSignalInfoLength))
 
 
+number		Information to be provided	
+
 guidance0		enter password
 guidance1		enter new password
 guidance2		enter new password again
 guidance3		bad password try again
 guidance4		bad password format try again
 
- 
+
 -- Data types for call parameters
 
 CallReference	 ::= OCTET STRING (SIZE (1..3))
 
 CallType	 ::= ENUMERATED{
+		incomingCall	(0),
 		forwardedCallPortion	(1),
 		reroutedCallPortion	(2),
-		outgoingCall	(3),
+		outgoingCall		(3),
 		ss-Request		(4)}
 
 SS-ChargingData	 ::= SEQUENCE {
 	ss-Code	[1] IMPLICIT SS-Code,
+	ss-Request	[2] IMPLICIT SS-Request,
 	charge	[3] IMPLICIT Charge OPTIONAL}
 
-SS-ChargingInfo	 ::= SEQUENCE 
+SS-ChargingInfo	 ::= SEQUENCE
 		     SIZE(1..maxNumberOfSupplServices)
-		     OF SS-ChargingData 
+		     OF SS-ChargingData
 
 CallDuration	 ::= INTEGER (0..maxCallDuration)
+
 CallDateTime	 ::= GeneralizedTime (SIZE (14 .. 24))
 		-- local time and time differential
 		-- to UTC time
@@ -1509,34 +1732,39 @@ CallDateTime	 ::= GeneralizedTime (SIZE (14 .. 24))
 PacketDataVolume	 ::= INTEGER (1..maxPacketDataVolume)
 
 Charge	 ::= INTEGER (1.. maxNumberOfChargingUnit)
+
 ChargingUnit	 ::= ENUMERATED {
-		specialDrawingRights (0)} 
+		specialDrawingRights (0)}
 
 CallStatus	 ::= ENUMERATED
 		{undetermined 			(0),
 		successfulNormalTermination		(1),
 		successfulAbnormalTermination		(2),
-		forwardedWithAbnormalTermination	(5),
+		forwarded				(4),
+		forwardedWithAbnormalTermination		(5),
 		rerouted				(6),
 		reroutedWithAbnormalTermination 		(7),
 		unsuccessfulNoRadioContact 		(8),
 		unsuccessfulNoResponse		(9),
 		unsuccessfulBusySubscriber 		(10),
 		unsuccessfulSystemFailed 		(11),
+		unsuccessfulSusbcriptionViolation 		(12),
 		unsuccessfulUnsupportedFacility 		(13)}
 
 NumberOfForwarding	 ::= INTEGER (1..5)
- 
- 
+
+
 -- Data types for radio parameters
 
+ChannelType	 ::= OCTET STRING (SIZE (1..10))
 		-- Concatenation of
 		-- Speech data indicator
 		-- Channel rate
-		-- Speech encoding algorithm/ data rate 
+		-- Speech encoding algorithm/data rate
 		-- + transparency indicator
 		-- as defined in Recommendation GSM 08.08
 
+
 ClassmarkInformation	 ::= OCTET STRING (SIZE (1..2))
 		-- classmark information element type 1 or 2
 		-- contents as defined in Recommendation 08.08
@@ -1547,11 +1775,14 @@ HandoverPriority	 ::= OCTET STRING (SIZE (1))
 
 
 
+
 HandoverType	 ::= ENUMERATED
 		{interBSS (0),
 		 intraBSS (1)}
- 
+
+
 -- Data types for security procedures
+
 AuthenticationSet	 ::= SEQUENCE {
 	rand	Rand,
 	sres	Sres,
@@ -1559,6 +1790,7 @@ AuthenticationSet	 ::= SEQUENCE {
 
 
 Rand	 ::= OCTET STRING (SIZE (16))
+
 Sres	 ::= OCTET STRING (SIZE (4))
 
 Kc	 ::= OCTET STRING (SIZE (8))
@@ -1566,14 +1798,17 @@ Kc	 ::= OCTET STRING (SIZE (8))
 Ki	 ::= OCTET STRING (SIZE (16))
 
 CKSN	 ::= OCTET STRING (SIZE (1))
+		-- bits 8-4 unused
 		-- bits 3-1 coded as specified in recommendation GSM 04.08
 
 
 CipheringMode	 ::= ENUMERATED{
 		noEncryption (1),
 		version1-GSM (2)}
- 
--- Data types for short message services 
+
+
+
+-- Data types for short message services
 
 SM-RP-DA	 ::= CHOICE{
 	imsi		[0] IMPLICIT IMSI,
@@ -1581,41 +1816,47 @@ SM-RP-DA	 ::= CHOICE{
 	roamingNumber	[3] IMPLICIT IsdnAddressString,
 	serviceCentreAddress	[4] IMPLICIT AddressString}
 
+
 SM-RP-OA	 ::= CHOICE{
 	msIsdn		[2] IMPLICIT IsdnAddressString,
 	serviceCentreAddress	[4] IMPLICIT AddressString}
 
 
 SM-RP-UI	 ::= OCTET STRING (SIZE (1..maxSignalInfoLength))
-Figure 6.4/9 (Sheet 1 of 1)
+
+Figure 6.4/9 
 ASN.1 Specification of MAP data types: short messages
- 
+
 -- fault recovery, call tracing
 
 TraceReference	 ::= OCTET STRING (SIZE (1..2))
 
+TraceType	 ::= INTEGER{
 		allEvents (0),
 		onlyCalls (1),
-		eventSet1 (2), 
+		eventSet1 (2),
 		eventSet254 (255)}
 		(0..255)
-		-- Identifiers eventSet1 to eventSet254  corresponds to 
+		-- Identifiers eventSet1 to eventSet254 corresponds to
 		-- sets of events pre-defined by each operator.
-NetworkResource	 ::= ENUMERATED 
+
+NetworkResource	 ::= ENUMERATED
 		{pLMN		(0),
 		hLR		(1),
 		vLR 		(2),
 		previous-VLR 	(3),
 		controlling-MSC 	(4),
 		vMSC 		(5),
+		eIR 		(6),
 		radioSubSystem	(7)}
- 
- 
+
+
 -- other data types
 
 RequestParameter	 ::= ENUMERATED{
 		request-IMSI 		(0),
 		request-AuthenticationSet 	(1),
+		request-SubscriberData 		(2),
 		request-CUG-Information 	(3),
 		request-Ki 			(4)}
 
@@ -1623,13 +1864,15 @@ RequestParameters	 ::= SEQUENCE SIZE (1..2) OF RequestParameter
 
 SentParameter	 ::= CHOICE{
 	imsi		[0] IMPLICIT IMSI,
+	authenticationSet	[1] IMPLICIT AuthenticationSet,
 	susbcriberData	[2] IMPLICIT SubscriberData,
 	cug-information	[3] IMPLICIT CUG-Information,
 	ki		[4] IMPLICIT Ki}
 	
 
-SentParameters	 ::= SEQUENCE 
+SentParameters	 ::= SEQUENCE
 		     SIZE(1..maxNumberOfSentParameters)
+		     OF SentParameter
 
 
 CmServiceType	 ::= ENUMERATED{
@@ -1637,6 +1880,7 @@ CmServiceType	 ::= ENUMERATED{
 		emergencyCallEstablishment 		(2),
 		shortMessageService 			(4),
 		ss-request 				(8),
+		mobileOriginatingCallRe-establishment	(9),
 		mobileTerminatingCall 			(10)}
 
 --
@@ -1644,6 +1888,7 @@ AccessConnectionStatus	 ::= OCTET STRING (SIZE (1))
 		-- Bit 8-4 Reserved
 		-- Bit 3
 		--     0 No RR- connection
+		--     1 RR-connection established
 		-- Bit 2
 		--     0 Ciphering mode off
 		--     1 Ciphering mode on
@@ -1651,29 +1896,34 @@ AccessConnectionStatus	 ::= OCTET STRING (SIZE (1))
 		--     0 MM-connection existing and authenticated
 		--     1 MM-connection existing and not authenticated
 
+END -- End of data types specifications
 
 -	Undetermined
 -	Successful with normal termination
 -	Successful with abnormal termination
+-	Spare
 -	Forwarded
 -	Forwarded with abnormal termination
 -	Rerouted
 -	Rerouted with abnormal termination
 -	Unsuccessful due to no radio contact
 -	Unsuccessful due to no response
--	Unsucessful due to busy subscriber
+-	Unsuccessful due to busy subscriber
 -	Unsuccessful due to system failure
--	Unsuccessful due to not supported  facility
- 
-MAP-AbortInformation  DEFINITIONS ::= 
+-	Unsuccessful due to subscription violation
+-	Unsuccessful due to not supported facility
+MAP-AbortInformation  DEFINITIONS ::=
+
 BEGIN
+
 IMPORTS
 maxSignalInfoLength FROM MAP-Constants;
-    
-MAPAbortInformation	 ::= SEQUENCE{ 
+   
+MAPAbortInformation	 ::= SEQUENCE{
 		abortCause ENUMERATED{
 			unspecifiedReason (0),
 			versionNotSupported (1),
+			userResourceLimitation (2),
 			resourceUnavailableLongTermProblem (3),
 			resourceUnavailableTemporaryProblem (4),
 			radioChannelRelease (5),
@@ -1681,14 +1931,16 @@ MAPAbortInformation	 ::= SEQUENCE{
 			callRelease (7),
 			associatedProcedureFailed (8),
 			remoteOperationFailure (9)},
+		additionalInformation OCTET STRING (SIZE(
 			1..MaxSignalInfoLength))}
 		--
-		-- The internal structure of the OCTET STRING 
+		-- The internal structure of the OCTET STRING
 		-- is up to the operator
 		
-END    
- 
-MAP-Protocol DEFINITIONS ::= 
+END
+
+MAP-Protocol DEFINITIONS ::=
+
 BEGIN
 IMPORTS
 
@@ -1696,6 +1948,7 @@ IMPORTS
 
 -- Location management
 UpdateLocationArea, UpdateLocation, CancelLocation,
+DetachIMSI, AttachIMSI, DeregisterMobileSubscriber,
 
 -- Data management
 SendParameters, InsertSubscriberData, DeleteSubscriberData,
@@ -1703,33 +1956,39 @@ SendParameters, InsertSubscriberData, DeleteSubscriberData,
 -- Supplementary Services Handling
 RegisterSS, EraseSS, ActivateSS,
 DeactivateSS, InterrogateSS, InvokeSS, ForwardSsNotification,
+RegisterPassword, GetPassword, ProcessUnstructuredSsData,
 
 -- Call set-up
-SendInfoForIncomingCall, SendInfoForOutgoingCall, SendRoutingInformation,ProvideRoamingNumber,
+SendInfoForIncomingCall, SendInfoForOutgoingCall, SendRoutingInformation, ProvideRoamingNumber,
 CompleteCall, ConnectToFollowingAddress, ProcessCallWaiting
 
 -- Paging
  Page, SearchForMobileSubscriber,
+
 -- Handover
- PerformHandover, SendEndSignal,
+PerformHandover, SendEndSignal,
 PerformSubsequentHandover, AllocateHandoverNumber, SendHandoverReport,
 ProcessAccessSignalling, ForwardAccessSignalling, NoteInternalHandover,
- 
+
+
 -- Charging
+RegisterChargingInformation,
 
 -- Restoration
 Reset, ForwardCheckSsIndication,
 
--- Authentication and security 
- Authenticate, ProvideIMSI,
+-- Authentication and security
+Authenticate, ProvideIMSI,
 ForwardNewTMSI, SetCipheringMode,
 
+
 -- Equipment management
 CheckIMEI,
 
 -- Short messages
 SendRoutingForShortMsg, ForwardShortMessage, SetMessageWaitingData,
 NoteMSPresent, AlertServiceCentre,
+
 -- Tracing
 ActivateTraceMode, DeactivateTraceMode, TraceSubscriberActivity,
 
@@ -1737,6 +1996,7 @@ ActivateTraceMode, DeactivateTraceMode, TraceSubscriberActivity,
 ProcessAccessRequest
 BeginSubscriberActivity
 FROM MAP-Operations
+
 -- imports error types
 
 UnknownSubscriber, UnknownBaseStation,UnknownMSC,
@@ -1744,29 +2004,33 @@ UnknownLocArea, UnidentifiedSubscriber,
 UnallocatedRoamingNumber, UnknownEquipment, RoamingNotAllowed,
 IllegalMS, BearerServiceNotProvisioned,
 TeleserviceNotProvisioned, InsufficientBearerCapabilities,
+CallBarred, ForwardingViolation, CUG-Reject,
 IllegalSS-Operation, SS-ErrorStatus, SS-NotAvailable,
-SS-SubscriptionViolation, SS-Incompatibility, FacilityNotSupported, InvalidTargetBaseStation, NoRadioResourceAvailable, 
-NoHandoverNumberAvailable,  
-SubsequentHandoverFailure,  AbsentSubscriber, 
-BusySubscriber, NoSubscriberReply, RadioCongestion, 
+SS-SubscriptionViolation, SS-Incompatibility, FacilityNotSupported, InvalidTargetBaseStation, NoRadioResourceAvailable,
+NoHandoverNumberAvailable,
+SubsequentHandoverFailure, AbsentSubscriber,
+BusySubscriber, NoSubscriberReply, RadioCongestion,
 ImpossibleCallCompletion, SM-DeliveryFailure, MessageWaitingListFull, SystemFailure, DataMissing,
-UnexpectedDataValue, PasswordRegistrationFailure, 
+UnexpectedDataValue, PasswordRegistrationFailure,
+NegativePasswordCheck, NoRoamingNumberAvailable,
 TracingBufferFull
 FROM MAP-Errors;
- 
- 
+
+
 -- allocation of local value to operations
 
 updateLocationArea UpdateLocationArea ::= 1
 
 updateLocation UpdateLocation ::= 2
+
 cancelLocation CancelLocation ::= 3
 
 provideRoamingNumber ProvideRoamingNumber ::= 4
 
 detachIMSI DetachIMSI ::= 5
 
-attachIMSI AttachIMSI ::= 6 
+attachIMSI AttachIMSI ::= 6
+
 insertSubscriberData InsertSubscriberData ::= 7
 
 deleteSubscriberData DeleteSubscriberData ::= 8
@@ -1774,6 +2038,7 @@ deleteSubscriberData DeleteSubscriberData ::= 8
 sendParameters SendParameters ::= 9
 
 registerSS RegisterSS ::= 10
+
 eraseSS EraseSS ::= 11
 
 activateSS ActivateSS ::= 12
@@ -1781,6 +2046,7 @@ activateSS ActivateSS ::= 12
 deactivateSS DeactivateSS ::= 13
 
 interrogateSS InterrogateSS ::= 14
+
 invokeSS InvokeSS ::= 15
 
 forwardSsNotification ForwardSsNotification ::= 16
@@ -1788,6 +2054,7 @@ forwardSsNotification ForwardSsNotification ::= 16
 registerPassword RegisterPassword ::= 17
 
 getPassword GetPassword ::= 18
+
 processUnstructuredSsData ::= 19
 
 sendInfoForIncomingCall SendInfoForIncomingCall ::= 20
@@ -1795,13 +2062,16 @@ sendInfoForIncomingCall SendInfoForIncomingCall ::= 20
 sendInfoForOutgoingCall SendInfoForOutgoingCall ::= 21
 
 sendRoutingInformation SendRoutingInformation ::= 22
+
 completeCall CompleteCall ::= 23
 
 connectToFollowingAddress ConnectToFollowingAddress ::= 24
 
 processCallWaiting ProcessCallWaiting ::= 25
- 
+
+
 page Page ::= 26
+
 searchForMobileSubscriber SearchForMobileSubscriber ::= 27
 
 performHandover PerformHandover ::= 28
@@ -1809,6 +2079,7 @@ performHandover PerformHandover ::= 28
 sendEndSignal SendEndSignal ::= 29
 
 performSubsequentHandover PerformSubsequentHandover ::= 30
+
 allocateHandoverNumber AllocateHandoverNumber ::= 31
 
 sendHandoverReport SendHandoverReport ::= 32
@@ -1816,6 +2087,7 @@ sendHandoverReport SendHandoverReport ::= 32
 processAccessSignalling ProcessAccessSignalling ::= 33
 
 forwardAccessSignalling ForwardAccessSignalling ::= 34
+
 noteInternalHandover NoteInternalHandover ::= 35
 
 registerChargingInformation RegisterChargingInformation ::= 36
@@ -1823,6 +2095,7 @@ registerChargingInformation RegisterChargingInformation ::= 36
 reset Reset ::= 37
 
 forwardCheckSsIndication ForwardCheckSsIndication ::= 38
+
 authenticate Authenticate ::= 39
 
 provideIMSi ProvideIMSI ::= 40
@@ -1830,6 +2103,7 @@ provideIMSi ProvideIMSI ::= 40
 forwardNewTMSI ForwardNewTMSI ::= 41
 
 setCipheringMode SetCipheringMode ::= 42
+
 checkIMEI CheckIMEI ::= 43
 
 sendRoutingInfoForSM SendRoutingInfoForSM ::= 45
@@ -1837,6 +2111,7 @@ sendRoutingInfoForSM SendRoutingInfoForSM ::= 45
 forwardShortMessage ForwardShortMessage ::= 46
 
 setMessageWaitingData SetMessageWaitingData ::= 47
+
 noteMSPresent NoteMsPresent ::= 48
 
 alertServiceCentre AlertServiceCentre ::= 49
@@ -1844,14 +2119,16 @@ alertServiceCentre AlertServiceCentre ::= 49
 activateTraceMode ActivateTraceMode ::= 50
 
 deactivateTraceMode DeactivateTraceMode ::= 51
+
 traceSubscriberActivity TraceSubscriberActivity ::= 52
- 
- 
+
+
 processAccessRequest ProcessAccessRequest ::= 53
 
 beginSubscriberActivity BeginSubscriberActivity ::= 54
 
 --
+-- allocation of local value to errors
 
 unknownSubscriber UnknownSubscriber ::= 1
 
@@ -1859,6 +2136,7 @@ unknownBaseStation UnknownBaseStation ::= 2
 
 unknownMSC UnknownMSC ::= 3
 
+unknownLocArea UnknownLocArea ::= 4
 
 unidentifiedSubscriber UnidentifiedSubscriber ::= 5
 
@@ -1866,6 +2144,7 @@ unallocatedRoamingNumber UnallocatedRoamingNumber ::= 6
 
 unknownEquipment UnknownEquipment ::= 7
 
+roamingNotAllowed RoamingNotAllowed ::= 8
 
 illegalMS IllegalMS ::= 9
 
@@ -1873,6 +2152,7 @@ bearerServiceNotProvisioned BearerServiceNotProvisioned ::= 10
 
 teleServiceNotProvisioned TeleServiceNotProvisioned ::= 11
 
+insufficientBearerCapabilities InsufficientBearerCapabilities ::= 12
 
 callBarred CallBarred ::= 13
 
@@ -1880,6 +2160,7 @@ forwardingViolation ForwardingViolation ::= 14
 
 cug-Reject CUG-Reject ::= 15
 
+illegalSS-Operation IllegalSS-Operation ::= 16
 
 ss-ErrorStatus SS-ErrorStatus ::= 17
 
@@ -1887,12 +2168,15 @@ ss-NotAvailable SS-NotAvailable ::= 18
 
 ss-SubscriptionViolation SS-SubscriptionViolation ::= 19
 
+ss-Incompatibility SS-Incompatibility ::= 20
 
 facilityNotSupported FacilityNotSupported ::= 21
 
 invalidTargetBaseStation InvalidTargetBaseStation  ::= 23
+
 noRadioResourceAvailable NoRadioResourceAvailable ::= 24
 
+noHandoverNumberAvailable NoHandoverNumberAvailable ::= 25
 
 subsequentHandoverFailure SubsequentHandoverFailure ::= 26
 
@@ -1900,6 +2184,7 @@ absentSubscriber AbsentSubscriber ::= 27
 
 busySubscriber BusySubscriber ::= 28
 
+noSubscriberReply NoSubscriberReply ::= 29
 
 radioCongestion RadioCongestion ::= 30
 
@@ -1907,6 +2192,7 @@ impossibleCallCompletion ImpossibleCallCompletion ::= 31
 
 sm-DeliveryFailure SM-DeliveryFailure ::= 32
 
+MessageWaitingListFull ::= 33
 
 systemFailure SystemFailure ::= 34
 
@@ -1914,6 +2200,7 @@ dataMissing DataMissing ::= 35
 
 unexpectedDataValue UnexpectedDataValue ::= 36
 
+passwordRegistrationFailure PasswordRegistrationFailure :: 37
 
 negativePasswordCheck NegativePasswordCheck ::= 38
 
@@ -1921,5 +2208,6 @@ noRoamingNumberAvailable NoRoamingNumberAvailable ::= 39
 
 tracingBufferFull TracingBufferFull ::= 40
 
+
 END
- 
+
diff --git a/output/390-s06.asn1 b/output/390-s06.asn1
index 452f900..06241c5 100644
--- a/output/390-s06.asn1
+++ b/output/390-s06.asn1
@@ -4,6 +4,7 @@ BEGIN
 
 EXPORTS
 
+-- exports operations types	
 
 -- Location management
 UpdateLocationArea, UpdateLocation, CancelLocation, DetachIMSI, AttachIMSI,
@@ -11,6 +12,7 @@ DeregisterMobileSubscriber,
 
 -- Subscriber data management
 InsertSubscriberData, DeleteSubscriberData, SendParameters,
+
 -- Supplementary Services Handling
 RegisterSS, EraseSS, ActivateSS,
 DeactivateSS, InterrogateSS, InvokeSS, ForwardSsNotification,
@@ -18,6 +20,7 @@ RegisterPassword, GetPassword, ProcessUnstructuredSsData,
 
 -- Call set-up
 SendInfoForIncomingCall, SendInfoForOutgoingCall,
+SendRoutingInformation, ProvideRoamingNumber, CompleteCall,
 ConnectToFollowingAddress, ProcessCallWaiting,
 
 -- Paging
@@ -25,6 +28,7 @@ ConnectToFollowingAddress, ProcessCallWaiting,
 
 -- Handover
  PerformHandover, SendEndSignal,
+PerformSubsequentHandover, AllocateHandoverNumber,
 SendHandoverReport, ProcessAccessSignalling,
 ForwardAccessSignalling,
 
@@ -32,6 +36,7 @@ ForwardAccessSignalling,
 RegisterChargingInformation,
 
 -- Fault recovery
+Reset, ForwardCheckSsIndication,
 
 -- Tracing
 ActivateTraceMode, DeactivateTraceMode, TraceSubscriberActivity,
@@ -39,6 +44,7 @@ NoteInternalHandover,
 
 -- Equipment management
 CheckIMEI,
+
 -- Authentication and security
 Authenticate, ProvideIMSI, ForwardNewTMSI, SetCipheringMode,
 
@@ -46,6 +52,7 @@ Authenticate, ProvideIMSI, ForwardNewTMSI, SetCipheringMode,
 SendRoutingInfoForSM, ForwardShortMessage, SetMessageWaitingData, NoteMSPresent, AlertServiceCentre,
 
 -- Access request
+ProcessAccessRequest, BeginSubscriberActivity;
 
 
 IMPORTS
@@ -53,6 +60,7 @@ OPERATION FROM TCAPMessages {ccitt recommendation q 773 moduleA(0)}
 
 -- imports data types
 
+AddressString, IsdnAddressString, ExternalSignalInfo,
 IMSI, TMSI, SubscriberId, IMEI, LMsId, LocAreaId, GlobalCellId,
 LocationInfo, HlrList, Category, EquipStatus, BasicServiceList,
 BasicServiceCode, BearerServiceCode, TeleserviceCode,
@@ -60,6 +68,7 @@ SubscriberData, SS-Information, SS-DataList, SS-Code,
 SS-CodeList, SS-Status, SS-Notification, Password, ChannelType,
 NoReplyConditionTime, UserToUserServiceIndicator,
 CUG-Index, CUG-Interlock, NumberOfConferees, NumberOfForwarding, ForwardingData, ForwardingFeatureList, ForwardingOptions, ClassmarkInformation, HandoverType, HandoverPriority, CallReference, CallType, CallDateTime, CallStatus, CallDuration, PacketDataVolume, ChargingUnit, Charge, SS-ChargingInfo,
+TraceReference, TraceType, NetworkResource, CmServiceType,
 AccessConnectionStatus, Rand, Sres, CipheringMode, Kc, CKSN,
 SS-UserData, RequestParameters, SentParameters, SM-RP-OA,
 SM-RP-DA, SM-RP-UI, GuidanceInfo FROM MAP-DataTypes
@@ -67,6 +76,7 @@ SM-RP-DA, SM-RP-UI, GuidanceInfo FROM MAP-DataTypes
 -- imports errors types
 
 UnknownSubscriber, UnknownBaseStation, UnknownMSC,
+UnknownLocArea, UnidentifiedSubscriber,
 UnallocatedRoamingNumber, UnknownEquipment,
 RoamingNotAllowed, IllegalMS, BearerServiceNotProvisioned,
 TeleserviceNotProvisioned, InsufficientBearerCapabilities,
@@ -74,12 +84,15 @@ CallBarred, ForwardingViolation, CUG-Reject, IllegalSS-Operation,
 SS-ErrorStatus, SS-NotAvailable, SS-SubscriptionViolation,
 SS-Incompatibility, InvalidTargetBaseStation,
 NoRadioResourceAvailable, NoHandoverNumberAvailable,
+SubsequentHandoverFailure, AbsentSubscriber, BusySubscriber,
 NoSubscriberReply, RadioCongestion, ImpossibleCallCompletion,
 SystemFailure, DataMissing, UnexpectedDataValue,
 PasswordRegistrationFailure, NegativePasswordCheck,
 NoRoamingNumberAvailable, TracingBufferFull, FacilityNotSupported, SM-DeliveryFailure, MessageWaitingListFull FROM MAP-Errors;
 
+
 -- operation types definitions
+-- Location management operations
 
 UpdateLocationArea ::= OPERATION
 PARAMETER	SEQUENCE{
@@ -87,6 +100,7 @@ PARAMETER	SEQUENCE{
 	previousLocAreaId	CHOICE{
 				LocAreaId,
 				NULL},
+	targetLocAreaId	LocAreaId,
 	cksn		CKSN }
 
 RESULT
@@ -94,6 +108,7 @@ RESULT
 ERRORS	
 	{UnknownSubscriber,
 	UnknownLocArea,
+	RoamingNotAllowed,
 	IllegalMS,
 	SystemFailure,
 	UnexpectedDataValue}
@@ -101,6 +116,7 @@ ERRORS
 --
 UpdateLocation ::= OPERATION
 PARAMETER	SEQUENCE{
+	imsi		IMSI,
 	locationInfo		LocationInfo,	
 	vlrNumber		IsdnAddressString,
 	lmsId		[10] IMPLICIT LMsId OPTIONAL}
@@ -108,6 +124,7 @@ PARAMETER	SEQUENCE{
 RESULT
 	hlrNumber		IsdnAddressString
 
+ERRORS	
 	{UnknownSubscriber,
 	RoamingNotAllowed,
 	SystemFailure,
@@ -115,6 +132,7 @@ RESULT
 
 --
 CancelLocation ::= OPERATION
+PARAMETER	CHOICE{
 	imsi		IMSI,
 			SEQUENCE{
 	imsi			IMSI,
@@ -122,6 +140,7 @@ CancelLocation ::= OPERATION
 
 RESULT
 
+ERRORS
 	{UnidentifiedSubscriber,
 	UnexpectedDataValue}
 
@@ -131,6 +150,7 @@ DetachIMSI ::= OPERATION
 PARAMETER
 	subscriberId	SubscriberId
 
+--
 AttachIMSI ::= OPERATION
 PARAMETER
 	subscriberId	SubscriberId
@@ -138,6 +158,7 @@ PARAMETER
 RESULT
 
 ERRORS
+	{UnknownSubscriber,
 	UnidentifiedSubscriber,
 	IllegalMS,
 	RoamingNotAllowed,
@@ -145,6 +166,7 @@ ERRORS
 	UnexpectedDataValue}
 
 --
+DeregisterMobileSubscriber ::= OPERATION
 PARAMETER
 	imsi		IMSI
 
@@ -152,6 +174,7 @@ RESULT
 
 ERRORS
 	{AbsentSubscriber,
+	UnknownSubscriber,
 	FacilityNotSupported,
 	UnexpectedDataValue}
 
@@ -159,6 +182,7 @@ ERRORS
 
 -- Subscriber data management
 
+InsertSubscriberData ::= OPERATION
 PARAMETER	SEQUENCE{
 	imsi		[0] IMPLICIT IMSI OPTIONAL,
 			COMPONENTS OF SubscriberData}
@@ -166,6 +190,7 @@ PARAMETER	SEQUENCE{
 RESULT
 
 ERRORS
+	{UnidentifiedSubscriber,
 	DataMissing,
 	UnexpectedDataValue}
 
@@ -173,6 +198,7 @@ ERRORS
 DeleteSubscriberData ::= OPERATION
 PARAMETER	SEQUENCE{
 	imsi 		[0] IMPLICIT IMSI,
+	basicService	[1] IMPLICIT BasicServiceList OPTIONAL,
 	ss-Code		[2] IMPLICIT SS-CodeList OPTIONAL}
 
 RESULT
@@ -180,6 +206,7 @@ RESULT
 ERRORS
 	{UnidentifiedSubscriber,
 	DataMissing,
+	UnexpectedDataValue}
 
 
 --
@@ -187,6 +214,7 @@ SendParameters ::= OPERATION
 PARAMETER	SEQUENCE{
 	subscriberId	SubscriberId,
 	requestParameters	RequestParameters}
+
 RESULT
 	sentParameters	SentParameters
 	-- optional (nothing is returned, if the requested
@@ -194,6 +222,7 @@ RESULT
 
 ERRORS
 	{UnknownSubscriber,
+	UnidentifiedSubscriber,
 	UnexpectedDataValue}
 
 
@@ -202,6 +231,7 @@ ERRORS
 RegisterSS ::= OPERATION
 PARAMETER	SEQUENCE{
 	ss-Code		SS-Code,
+	basicService	BasicServiceCode OPTIONAL,
 	forwardedToNumber	[4] IMPLICIT IsdnAddressString OPTIONAL,
 	noReplyConditionTime	[5] IMPLICIT NoReplyConditionTime OPTIONAL}
 
@@ -209,6 +239,7 @@ RESULT
 	ss-Information	SS-Information -- optional
 
 ERRORS
+	{UnknownSubscriber,
 	IllegalSS-Operation,
 	SS-ErrorStatus,
 	SS-NotAvailable,
@@ -216,6 +247,7 @@ ERRORS
 	TeleServiceNotProvisioned,
 	SS-SubscriptionViolation,
 	SS-Incompatibility,
+	NegativePasswordCheck,
 	UnexpectedDataValue,
 	DataMissing,
 	SystemFailure}
@@ -223,6 +255,7 @@ ERRORS
 
 --
 EraseSS ::= OPERATION
+PARAMETER	SEQUENCE{
 	ss-Code		SS-Code,
 	basicService	BasicServiceCode OPTIONAL}
 
@@ -230,6 +263,7 @@ RESULT
 	ss-Information	SS-Information -- optional
 
 ERRORS
+	{UnknownSubscriber,
 	NegativePasswordCheck,
 	IllegalSS-Operation,
 	SS-ErrorStatus,
@@ -237,7 +271,9 @@ ERRORS
 	UnexpectedDataValue,
 	SystemFailure}
 
+
 --
+ActivateSS ::= OPERATION
 PARAMETER	SEQUENCE{
 	ss-Code		SS-Code,
 	basicService	BasicServiceCode OPTIONAL}
@@ -245,6 +281,7 @@ PARAMETER	SEQUENCE{
 RESULT
 	ss-Information	SS-Information -- optional
 
+ERRORS
 	{UnknownSubscriber,
 	NegativePasswordCheck,
 	IllegalSS-Operation,
@@ -252,6 +289,7 @@ RESULT
 	SS-NotAvailable,
 	SS-SubscriptionViolation,
 	SS-Incompatibility,
+	UnexpectedDataValue,
 	SystemFailure}
 
 --
@@ -260,18 +298,22 @@ PARAMETER	SEQUENCE{
 	ss-Code		SS-Code,
 	basicService	BasicServiceCode OPTIONAL}
 
+
 RESULT
 	ss-Information	SS-Information -- optional
 
 ERRORS
 	{UnknownSubscriber,
 	IllegalSS-Operation,
+	SS-ErrorStatus,
 	SS-SubscriptionViolation,
 	NegativePasswordCheck,
 	UnexpectedDataValue,
 	SystemFailure}
 
+
 --
+InterrogateSS ::= OPERATION
 PARAMETER	SEQUENCE{
 	ss-Code		SS-Code,
 	basicService	BasicServiceCode OPTIONAL}
@@ -279,6 +321,7 @@ PARAMETER	SEQUENCE{
 RESULT 		CHOICE{
 	ss-Status		[0] IMPLICIT SS-Status,
 	forwardedToNumber	[1] IMPLICIT IsdnAddressString,	
+	activesBasicServices	[2] IMPLICIT BasicServiceList,
 	forwardingFeatureList	[3] IMPLICIT ForwardingFeatureList}
 
 
@@ -286,6 +329,7 @@ ERRORS
 	{UnknownSubscriber,
 	NegativePasswordCheck,
 	IllegalSS-Operation,
+	SS-NotAvailable,
 	UnexpectedDataValue,
 	SystemFailure}
 
@@ -293,6 +337,7 @@ ERRORS
 InvokeSS ::= OPERATION
 PARAMETER	SEQUENCE{
 	ss-Code		SS-Code,
+	basicService	BasicServiceCode OPTIONAL,
 	userToUserServiceIndicator	[4] IMPLICIT UserToUserServiceIndicator OPTIONAL, 	
 	cug-Index		[5] IMPLICIT CUG-Index OPTIONAL,
 	numberOfConferees	[6] IMPLICIT NumberOfConferees OPTIONAL}
@@ -300,6 +345,7 @@ PARAMETER	SEQUENCE{
 RESULT
 	cug-Interlock	CUG-Interlock -- optional
 
+
 ERRORS
 	{IllegalSS-Operation,
 	SS-ErrorStatus,
@@ -307,6 +353,7 @@ ERRORS
 	SS-SubscriptionViolation,
 	SS-Incompatibility,
 	CUG-Reject,
+	DataMissing,
 	UnexpectedDataValue,
 	SystemFailure}
 
@@ -316,6 +363,7 @@ PARAMETER	SEQUENCE{
 	imsi		[0] IMPLICIT IMSI OPTIONAL,
 	ss-Code		[1] IMPLICIT SS-Code OPTIONAL,
 	teleservice		[2] IMPLICIT TeleserviceCode OPTIONAL,
+	bearerService	[3] IMPLICIT BearerServiceCode OPTIONAL,
 	ss-Status		[4] IMPLICIT SS-Status OPTIONAL,
 	ss-Notification	[5] IMPLICIT SS-Notification OPTIONAL}
 
@@ -323,6 +371,7 @@ PARAMETER	SEQUENCE{
 RegisterPassword ::= OPERATION
 
 PARAMETER
+	ss-Code		SS-Code
 
 RESULT
 	newPassword 	Password
@@ -330,6 +379,7 @@ RESULT
 ERRORS
 	{NegativePasswordCheck,
 	PasswordRegistrationFailure,
+	SS-SubscriptionViolation,
 	UnexpectedDataValue,
 	SystemFailure}
 
@@ -337,6 +387,7 @@ LINKED
 	{GetPassword}
 
 --
+GetPassword ::= OPERATION
 PARAMETER
 	guidanceInfo	GuidanceInfo
 
@@ -344,6 +395,7 @@ RESULT
 	currentPassword	Password
 
 --
+ProcessUnstructuredSsData ::= OPERATION
 PARAMETER
 	ss-UserData		SS-UserData	
 
@@ -351,6 +403,7 @@ RESULT
 	ss-UserData		SS-UserData -- optional
 
 ERRORS
+	{UnexpectedDataValue,
 	SystemFailure}
 	-- UnexpectedDataValue is used when data from MS does not correspond
 	-- to any service implemented in HLR
@@ -358,6 +411,7 @@ ERRORS
 
 -- Call set-up
 --
+SendInfoForIncomingCall ::= OPERATION
 PARAMETER		SEQUENCE{
 	incomingId		CHOICE{
 	roamingNumber	[0] IMPLICIT IsdnAddressString,
@@ -365,6 +419,7 @@ PARAMETER		SEQUENCE{
 	bearerService	[2] IMPLICIT BearerServiceCode OPTIONAL,
 	teleservice		[3] IMPLICIT TeleserviceCode OPTIONAL,
 	lMsId		[4] IMPLICIT LMsId OPTIONAL,
+	dialledNumber	[5] IMPLICIT IsdnAddressString OPTIONAL,
 	cug-Interlock	[6] IMPLICIT CUG-Interlock OPTIONAL,
 	numberOfForwarding	[7] IMPLICIT NumberOfForwarding OPTIONAL}
 
@@ -372,6 +427,7 @@ ERRORS
 	UnallocatedRoamingNumber,
 	UnknownSubscriber,
 	UnidentifiedSubscriber,
+	AbsentSubscriber,
 	ImpossibleCallCompletion,
 	ForwardingViolation,
 	UnexpectedDataValue,
@@ -379,6 +435,7 @@ ERRORS
 	SystemFailure}
 
 LINKED
+	CompleteCall,
 	ProcessCallWaiting,
 	ConnectToFollowingAddress}
 
@@ -386,6 +443,7 @@ LINKED
 SendInfoForOutgoingCall ::= OPERATION
 PARAMETER	SEQUENCE{
 	calledNumber	[0] IMPLICIT IsdnAddressString,
+	bearerService	[2] IMPLICIT BearerServiceCode OPTIONAL,
 	teleService		[3] IMPLICIT TeleserviceCode OPTIONAL}
 
 ERRORS
@@ -393,6 +451,7 @@ ERRORS
 	BearerServiceNotProvisioned,
 	TeleserviceNotProvisioned,
 	CallBarred,
+	CUG-Reject,
 	DataMissing,
 	UnexpectedDataValue,
 	SystemFailure}
@@ -400,7 +459,9 @@ ERRORS
 LINKED
 	{CompleteCall}
 
+
 SendRoutingInformation ::= OPERATION
+PARAMETER	SEQUENCE{
 	msIsdn		[0]  IMPLICIT IsdnAddressString,
 	cug-Interlock	[1]  IMPLICIT CUG-Interlock OPTIONAL,
 	numberOfForwarding	[2]  IMPLICIT NumberOfForwarding OPTIONAL,
@@ -408,6 +469,7 @@ SendRoutingInformation ::= OPERATION
 
 -- If available from the network the ISDN Bearer Capabilities and the ISDN High Layer
 -- Compatibility and Low Layer Compatibility information elements are included in
+-- the networkSignalInfo parameter as defined in section 6.4.3.8.9.
 -- The information is passed according to the rules specified in GSM 09.07.
 
 RESULT		SEQUENCE{
@@ -415,6 +477,7 @@ RESULT		SEQUENCE{
 	routingInfo		CHOICE{
 	roamingNumber		IsdnAddressString,
 	forwardingData		ForwardingData}}
+	
 ERRORS
 	UnknownSubscriber,
 	CallBarred,
@@ -422,12 +485,15 @@ ERRORS
 	BearerServiceNotProvisioned,
 	TeleServiceNotProvisioned,
 	FacilityNotSupported,
+	AbsentSubscriber,
 	ForwardingViolation,
 	SystemFailure,
 	DataMissing,
 	UnexpectedDataValue}
 
+
 ProvideRoamingNumber ::= OPERATION
+
 PARAMETER	SEQUENCE{
 	imsi		[0] IMPLICIT IMSI,
 	mscNumber		[1] IMPLICIT IsdnAddressString OPTIONAL,
@@ -435,6 +501,7 @@ PARAMETER	SEQUENCE{
 	previousRoamingNumber  [3] IMPLICIT IsdnAddressString OPTIONAL,
 	lMsId		[4] IMPLICIT LMsId OPTIONAL,
 	gSM-BearerCapability	[5] IMPLICIT ExternalSignalInfo OPTIONAL,
+	networkSignalInfo	[6] IMPLICIT ExternalSignalInfo OPTIONAL}
 
 -- If available from the network the ISDN High Layer Compatibility information element is
 -- carried in the networkSignalInfo parameter as shown in section 6.4.3.8.9.
@@ -442,6 +509,7 @@ PARAMETER	SEQUENCE{
 
 RESULT
 	roamingNumber	IsdnAddressString
+
 ERRORS
 	{AbsentSubscriber,
 	NoRoamingNumberAvailable,
@@ -449,6 +517,7 @@ ERRORS
 	SystemFailure,
 	DataMissing,
 	UnexpectedDataValue}
+--
 CompleteCall ::= OPERATION
 PARAMETER	SEQUENCE{
 	msIsdn		[0] IMPLICIT IsdnAddressString,
@@ -456,6 +525,7 @@ PARAMETER	SEQUENCE{
 	cug-Index		[2] IMPLICIT CUG-Index OPTIONAL,
 	gSM-BearerCapability	[3] IMPLICIT ExternalSignalInfo OPTIONAL,
 	noReplyConditionTime	[4] IMPLICIT NoReplyConditionTime OPTIONAL,
+	ss-DataList		[5] IMPLICIT SS-DataList OPTIONAL}
 
 ERRORS
 	{NoSubscriberReply,
@@ -463,6 +533,7 @@ ERRORS
 	BusySubscriber,
 	DataMissing,
 	UnexpectedDataValue}
+--
 ConnectToFollowingAddress ::= OPERATION
 PARAMETER	SEQUENCE{
 	forwardingData	ForwardingData,
@@ -470,7 +541,9 @@ PARAMETER	SEQUENCE{
 --
 ProcessCallWaiting ::= OPERATION
 
+
 -- Paging
+--
 Page ::= OPERATION
 PARAMETER	SEQUENCE{
 	imsi		[0] IMPLICIT IMSI,
@@ -478,6 +551,7 @@ PARAMETER	SEQUENCE{
 	locAreaId		[2] IMPLICIT LocAreaId}
 
 
+ERRORS
 	{AbsentSubscriber,
 	UnknownLocArea,
 	BusySubscriber,
@@ -485,6 +559,7 @@ PARAMETER	SEQUENCE{
 	UnexpectedDataValue}
 
 
+--
 SearchForMobileSubscriber ::= OPERATION
 PARAMETER	SEQUENCE{
 	imsi		IMSI,
@@ -492,6 +567,7 @@ PARAMETER	SEQUENCE{
 				LocAreaId,
 				NULL}}
 
+RESULT
 	currentLocAreaId	LocAreaId
 
 
@@ -499,6 +575,7 @@ ERRORS
 	{AbsentSubscriber,
 	BusySubscriber,
 	SystemFailure,
+	UnexpectedDataValue}
 
 --
 
@@ -508,6 +585,7 @@ ERRORS
 PerformHandover ::= OPERATION
 PARAMETER	SEQUENCE{
 	targetCellId		GlobalCellId,
+	servingCellId	GlobalCellId,
 	channelType	ChannelType,
 	classmarkInformation	ClassmarkInformation,
 	handoverPriority 	[11] IMPLICIT HandoverPriority OPTIONAL,
@@ -515,6 +593,7 @@ PARAMETER	SEQUENCE{
 
 RESULT		SEQUENCE{
 	handoverNumber	IsdnAddressString,
+	accessSignalInfo	ExternalSignalInfo}
 	-- protocolId for ExternalSignalInfo
 	-- should indicate "gsm-04.08-version1"
 
@@ -522,6 +601,7 @@ ERRORS
 	{UnknownBaseStation,
 	InvalidTargetBaseStation,
 	NoRadioResourceAvailable,
+	NoHandoverNumberAvailable,
 	SystemFailure,
 	UnexpectedDataValue}
 
@@ -529,6 +609,7 @@ ERRORS
 --
 SendEndSignal ::= OPERATION
 
+RESULT
 
 
 --
@@ -536,6 +617,7 @@ PerformSubsequentHandover ::= OPERATION
 PARAMETER	SEQUENCE{
 	targetCellId		GlobalCellId,
 	servingCellId	GlobalCellId,
+	targetMscNumber	IsdnAddressString,
 	classmarkInformation	[10] IMPLICIT ClassmarkInformation OPTIONAL}
 
 RESULT
@@ -543,13 +625,16 @@ RESULT
 -- protocolId should indicate "gsm-04.08-version1"}
 
 
+ERRORS
 	{UnknownBaseStation,
 	InvalidTargetBaseStation,
 	UnknownMSC,
 	SubsequentHandoverFailure,
 	UnexpectedDataValue}
 
+
 --
+AllocateHandoverNumber ::= OPERATION
 
 ERRORS
 	{NoHandoverNumberAvailable}
@@ -557,6 +642,7 @@ ERRORS
 LINKED
 	{SendHandoverReport}
 
+
 --
 SendHandoverReport ::= OPERATION
 PARAMETER
@@ -564,6 +650,7 @@ PARAMETER
 
 RESULT
 
+
 --
 ProcessAccessSignalling ::= OPERATION
 PARAMETER
@@ -572,6 +659,7 @@ PARAMETER
 
 
 
+
 --
 ForwardAccessSignalling ::= OPERATION
 PARAMETER
@@ -579,6 +667,8 @@ PARAMETER
 -- protocolId should indicate "gsm-0806-version1"
 
 
+
+
 -- Charging
 --
 RegisterChargingInformation ::= OPERATION
@@ -586,6 +676,7 @@ PARAMETER	SEQUENCE{
 	msIsdn		IsdnAddressString,
 	mscNumber		IsdnAddressString,
 	imsi		IMSI,
+	callReference	CallReference,
 	callType		CallType,
 	callStatus		CallStatus,
 	callDateTime	CallDateTime,
@@ -593,6 +684,7 @@ PARAMETER	SEQUENCE{
 	bearerServiceCode	[10] IMPLICIT BearerServiceCode OPTIONAL,
 	teleserviceCode 	[11] IMPLICIT TeleserviceCode OPTIONAL,
 	calledNumber 	[12] IMPLICIT IsdnAddressString OPTIONAL,
+	callingNumber	[13] IMPLICIT IsdnAddressString OPTIONAL,
 	packetDataVolume	[14] IMPLICIT PacketDataVolume OPTIONAL,
 	chargingUnit		[15] IMPLICIT ChargingUnit OPTIONAL,
 	charge		[16] IMPLICIT Charge OPTIONAL,
@@ -600,13 +692,16 @@ PARAMETER	SEQUENCE{
 
 RESULT
 
+ERRORS
 	{UnknownSubscriber,
 	DataMissing,
 	UnexpectedDataValue}
 
 
 
+
 -- Fault recovery
+--
 Reset ::= OPERATION
 PARAMETER	SEQUENCE{
 	networkResource	NetworkResource,
@@ -614,6 +709,7 @@ PARAMETER	SEQUENCE{
 	hlrId		HlrList OPTIONAL}
 
 
+--
 
 ForwardCheckSsIndication ::= OPERATION
 
@@ -621,6 +717,7 @@ ForwardCheckSsIndication ::= OPERATION
 
 -- Tracing
 --
+ActivateTraceMode ::= OPERATION
 PARAMETER	SEQUENCE{
 	imsi		[0] IMPLICIT IMSI OPTIONAL,
 	traceReference	[1] IMPLICIT TraceReference ,
@@ -629,12 +726,14 @@ PARAMETER	SEQUENCE{
 
 RESULT	
 
+
 ERRORS
 	{UnidentifiedSubscriber,
 	FacilityNotSupported,
 	TracingBufferFull,
 	SystemFailure,
 	DataMissing,
+	UnexpectedDataValue}
 
 --
 DeactivateTraceMode ::= OPERATION
@@ -642,6 +741,7 @@ PARAMETER	SEQUENCE{
 	imsi		[0] IMPLICIT IMSI OPTIONAL,
 	traceReference	[1] IMPLICIT TraceReference}
 
+RESULT
 
 ERRORS
 	{UnidentifiedSubscriber,
@@ -650,12 +750,14 @@ ERRORS
 	DataMissing,
 	UnexpectedDataValue}
 
+
 --
 TraceSubscriberActivity ::= OPERATION
 PARAMETER	SEQUENCE{
 	imsi		[0] IMPLICIT IMSI OPTIONAL,
 	traceReference	[1] IMPLICIT TraceReference,
 	traceType		[2] IMPLICIT TraceType,
+	omcId 		[3] IMPLICIT AddressString OPTIONAL,
 	callReference	[4] IMPLICIT CallReference OPTIONAL}
 
 --
@@ -663,6 +765,7 @@ NoteInternalHandover ::= OPERATION
 
 PARAMETER	SEQUENCE{
 	handoverType	HandoverType,
+	targetCellId		[1] IMPLICIT GlobalCellId OPTIONAL,
 	channelId		[2] IMPLICIT ExternalSignalInfo OPTIONAL}
 
 
@@ -671,6 +774,7 @@ PARAMETER	SEQUENCE{
 CheckIMEI ::= OPERATION
 PARAMETER
 	imei		IMEI
+
 RESULT
 	equipStatus		EquipStatus
 
@@ -680,12 +784,15 @@ ERRORS
 	UnexpectedDataValue}
 
 
+
+
 -- Authentication and security
 --
 Authenticate ::= OPERATION
 PARAMETER	SEQUENCE{
 	rand		Rand,
 	cksn		CKSN}
+
 RESULT
 	sres		Sres
 
@@ -693,6 +800,7 @@ RESULT
 
 --
 ProvideIMSI ::= OPERATION
+
 RESULT
 	imsi		IMSI
 
@@ -700,6 +808,8 @@ ERRORS
 	{AbsentSubscriber}
 
 
+
+--
 ForwardNewTMSI ::= OPERATION
 PARAMETER
 	tmsi		TMSI
@@ -707,13 +817,16 @@ PARAMETER
 RESULT
 
 --
+SetCipheringMode ::= OPERATION
 PARAMETER	SEQUENCE{
 	cipheringMode	CipheringMode,
 	kc		Kc OPTIONAL}
 -- Kc should be included when cipheringMode indicates
 -- that ciphering must be performed
 
+
 -- Short messages
+
 SendRoutingInfoForSM ::= OPERATION
 PARAMETER	SEQUENCE{
 	msIsdn		[0] IMPLICIT IsdnAddressString,
@@ -721,6 +834,7 @@ PARAMETER	SEQUENCE{
 	serviceCentreAddress	[2] IMPLICIT AddressString,
 	cug-Interlock	[3] IMPLICIT CUG-Interlock OPTIONAL,
 	teleserviceCode	[5] IMPLICIT TeleserviceCode OPTIONAL}
+
 RESULT		SEQUENCE{
 	imsi		IMSI,
 			CHOICE{
@@ -728,6 +842,7 @@ RESULT		SEQUENCE{
 	locationInfo				LocationInfo,
 	lMsId				LMsId OPTIONAL},
 	forwardingData		[1] IMPLICIT ForwardingData},
+	mwd-Set			[2] IMPLICIT BOOLEAN OPTIONAL}
 
 ERRORS
 	{UnknownSubscriber,
@@ -735,6 +850,7 @@ ERRORS
 	CUG-Reject,
 	TeleServiceNotProvisioned,
 	AbsentSubscriber,
+	FacilityNotSupported,
 	SystemFailure,
 	DataMissing,
 	UnexpectedDataValue}
@@ -742,6 +858,7 @@ ERRORS
 
 --
 ForwardShortMessage ::= OPERATION
+PARAMETER	SEQUENCE{
 	sm-RP-DA		SM-RP-DA,
 	sm-RP-OA		SM-RP-OA,
 	sm-RP-UI		SM-RP-UI}
@@ -749,6 +866,7 @@ ForwardShortMessage ::= OPERATION
 RESULT
 
 ERRORS
+	{UnidentifiedSubscriber,
 	AbsentSubscriber,
 	FacilityNotSupported,
 	IllegalMS,
@@ -756,6 +874,7 @@ ERRORS
 	UnexpectedDataValue,
 	SM-DeliveryFailure}
 
+--
 SetMessageWaitingData ::= OPERATION
 PARAMETER	SEQUENCE{
 	msIsdn		IsdnAddressString,
@@ -763,6 +882,7 @@ PARAMETER	SEQUENCE{
 
 RESULT
 
+
 ERRORS
 	{UnknownSubscriber,
 	MessageWaitingListFull,
@@ -770,6 +890,7 @@ ERRORS
 
 
 --
+NoteMSPresent ::= OPERATION
 
 PARAMETER
 	imsi		IMSI
@@ -777,12 +898,15 @@ PARAMETER
 
 --
 AlertServiceCentre ::= OPERATION
+PARAMETER	SEQUENCE{
 	msIsdn		IsdnAddressString,
 	serviceCentreAddress	AddressString}
 
 
 
+
 -- Access request
+--
 ProcessAccessRequest ::= OPERATION
 PARAMETER	SEQUENCE{
 	subscriberId		SubscriberId,
@@ -790,6 +914,7 @@ PARAMETER	SEQUENCE{
 	accessConnectionStatus	AccessConnectionStatus,
 	cksn		CKSN}
 
+RESULT		SEQUENCE{
 	imsi 		IMSI,
 	msIsdn 		IsdnAddressString OPTIONAL}
 
@@ -797,6 +922,7 @@ ERRORS
 	{IllegalMS,
 	UnknownSubscriber,
 	UnidentifiedSubscriber,
+	SystemFailure,
 	UnexpectedDataValue }
 
 
@@ -804,6 +930,7 @@ ERRORS
 --
 BeginSubscriberActivity ::= OPERATION
 PARAMETER	SEQUENCE{
+	imsi		IMSI,
 	originatingEntityNumber	IsdnAddressString}
 
 
@@ -811,16 +938,19 @@ PARAMETER	SEQUENCE{
 
 END   -- End of operation types definitions --
 
+
 MAP-Errors DEFINITIONS ::=
 
 BEGIN
 
+
 EXPORTS
 UnknownSubscriber, UnknownBaseStation,UnknownMSC,
 UnknownLocArea, UnidentifiedSubscriber,
 UnallocatedRoamingNumber, UnknownEquipment, RoamingNotAllowed,
 IllegalMS, BearerServiceNotProvisioned,
 TeleserviceNotProvisioned, InsufficientBearerCapabilities,
+CallBarred, ForwardingViolation, CUG-Reject,
 IllegalSS-Operation, SS-ErrorStatus, SS-NotAvailable,
 SS-SubscriptionViolation, SS-Incompatibility, FacilityNotSupported, InvalidTargetBaseStation,
 NoRadioResourceAvailable, NoHandoverNumberAvailable,
@@ -828,6 +958,7 @@ SubsequentHandoverFailure,
 AbsentSubscriber, BusySubscriber, NoSubscriberReply,
 RadioCongestion, ImpossibleCallCompletion, SM-DeliveryFailure,
 MessageWaitingListFull, SystemFailure, DataMissing,
+UnexpectedDataValue, PasswordRegistrationFailure,
 NegativePasswordCheck, NoRoamingNumberAvailable,
 TracingBufferFull;
 
@@ -835,6 +966,7 @@ IMPORTS
 ERROR FROM TCAPMessages {ccitt recommendation q 773 moduleA(0)}
 
 SS-Code, SS-CodeList, SS-Status, SS-SubscriptionOption, BasicServiceCode,
+NetworkResource FROM MAP-DataTypes;
 
 
 -- error types definitions
@@ -842,6 +974,7 @@ SS-Code, SS-CodeList, SS-Status, SS-SubscriptionOption, BasicServiceCode,
 UnknownSubscriber ::= ERROR
 
 UnknownBaseStation ::= ERROR
+
 UnknownMSC ::= ERROR
 
 UnknownLocArea ::= ERROR
@@ -849,6 +982,7 @@ UnknownLocArea ::= ERROR
 
 UnidentifiedSubscriber ::= ERROR
 
+UnallocatedRoamingNumber ::= ERROR
 
 UnknownEquipment ::= ERROR
 
@@ -856,6 +990,7 @@ RoamingNotAllowed ::= ERROR
 
 IllegalMS ::= ERROR
 
+BearerServiceNotProvisioned ::= ERROR
 
 TeleServiceNotProvisioned ::= ERROR
 
@@ -863,6 +998,7 @@ InsufficientBearerCapabilities ::= ERROR
 
 CallBarred ::= ERROR
 PARAMETER
+	cause ENUMERATED {
 		barringServiceActive (0),
 		operatorBarring (1)} -- optional
 
@@ -870,6 +1006,7 @@ PARAMETER
 ForwardingViolation ::= ERROR
 
 --
+CUG-Reject ::= ERROR
 PARAMETER
 	cause ENUMERATED {
 		incomingCallBarred(0),
@@ -877,6 +1014,7 @@ PARAMETER
 
 --
 IllegalSS-Operation ::= ERROR
+
 --
 SS-ErrorStatus ::= ERROR
 PARAMETER
@@ -884,12 +1022,15 @@ PARAMETER
 
 --
 SS-NotAvailable ::= ERROR
+
 SS-SubscriptionViolation ::= ERROR
 PARAMETER	
 	ss-SubscriptionOption SS-SubscriptionOption -- optional
 
 
+
 --
+SS-Incompatibility ::= ERROR
 PARAMETER 		SEQUENCE{
 	ss-Code		[1] IMPLICIT SS-Code OPTIONAL,
 	basicService 	BasicServiceCode OPTIONAL,
@@ -897,6 +1038,7 @@ PARAMETER 		SEQUENCE{
 
 --
 FacilityNotSupported ::= ERROR
+
 --
 InvalidTargetBaseStation ::= ERROR
 
@@ -904,6 +1046,7 @@ NoRadioResourceAvailable ::= ERROR
 
 NoHandoverNumberAvailable ::= ERROR
 
+
 SubsequentHandoverFailure ::= ERROR
 
 
@@ -911,6 +1054,7 @@ AbsentSubscriber ::= ERROR
 PARAMETER	
 	mwd-Set		BOOLEAN -- optional
 
+BusySubscriber ::= ERROR
 
 NoSubscriberReply ::= ERROR
 
@@ -918,6 +1062,7 @@ RadioCongestion ::= ERROR
 
 ImpossibleCallCompletion ::= ERROR
 PARAMETER		
+	activeSupplServices	SS-CodeList -- optional
 
 SM-DeliveryFailure ::= ERROR
 PARAMETER
@@ -925,13 +1070,16 @@ PARAMETER
 		msProtocolError (1),
 		msNotEquiped (2),
 		unknownServiceCentre (3),
+		scCongestion (4),
 		invalidSmeAddress (5),
 		msNotScSubscriber (6)}
 
 MessageWaitingListFull ::= ERROR
 
 
+
 --
+SystemFailure ::= ERROR
 PARAMETER	NetworkResource -- optional
 
 DataMissing ::= ERROR
@@ -939,6 +1087,7 @@ DataMissing ::= ERROR
 UnexpectedDataValue ::= ERROR
 
 PasswordRegistrationFailure ::= ERROR
+PARAMETER	
 	diagnostic  ENUMERATED{undetermined (0),
 		invalidFormat (1),
 		newPasswordsMismatch (2)}
@@ -946,15 +1095,18 @@ PasswordRegistrationFailure ::= ERROR
 
 NegativePasswordCheck ::= ERROR
 
+NoRoamingNumberAvailable ::= ERROR
 
 TracingBufferFull ::= ERROR
 
 
 END  -- End of error types definitions
+
 MAP-Constants DEFINITIONS ::=
 
 BEGIN
 
+EXPORTS
 
 maxSignalInfoLength,
 maxNumberOfTeleServices,
@@ -962,6 +1114,7 @@ maxNumberOfBearerServices,
 maxNumberOfSupplServices,
 
 maxNumberOfCUG,
+maxNumberOfBasicServices,
 maxNumberOfForwardingFeatures,
 maxNumberOfCallBarringFeatures,
 maxNumberOfHlrId,
@@ -969,6 +1122,7 @@ maxPacketDataVolume,
 maxNumberOfChargingUnit,
 maxCallDuration,
 maxAddressLength,
+maxNumberOfSentParameters;
 
 -- value assignment
 
@@ -976,6 +1130,7 @@ maxSignalInfoLength INTEGER  ::= 200
 -- this NamedValue represent the theoretical maximum number
 -- of octets which available to carry a single data type, without
 -- requiring segmentation to cope with the network layer service.
+-- However the actual maximum size available for a data type
 -- may be lower, especially when other information elements have
 -- to be included in the same component
 
@@ -985,10 +1140,12 @@ maxSignalInfoLength INTEGER  ::= 200
 maxNumberOfTeleservices 		INTEGER ::=  20
 maxNumberOfBearerServices 		INTEGER ::=  50
 maxNumberOfSupplServices 		INTEGER ::=  30
+
 maxNumberOfCUG			INTEGER ::=  10
 maxNumberOfBasicServices 		INTEGER ::=  70
 maxNumberOfForwardingFeatures		INTEGER ::=  13
 maxNumberOfCallBarringFeatures 		INTEGER ::=  13
+maxNumberOfHlrId			INTEGER ::=  50
 maxPacketDataVolume 		INTEGER ::= 100
 maxNumberOfChargingUnit 		INTEGER ::= 16777215
 maxCallDuration 			INTEGER ::= 16777215
@@ -996,9 +1153,11 @@ maxAddressLength 			INTEGER ::=  20
 
 maxNumberOfSentParameters 		INTEGER ::=  10
 -- this named value should correspond to the maximum of
+-- the maxNumberOfCUG and the maximum number of authentication
 -- set which may be returned by a HLR plus 1.
 END
 
+ExternalSignalInfo ::=  SEQUENCE{
 		protocolId    ProtocolId,
 		signalInfo  SignalInfo}
 
@@ -1006,14 +1165,17 @@ maxExternalInfoLength INTEGER  ::= 200
 
 Signal ::= OCTET STRING (SIZE (1..maxExternalInfoLength))
 
+ProtocolId    ::= ENUMERATED{
 		gsm-0408		(1),
 		gsm-0806		(2),
 		gsm-0808-bssmap	(3),
 		ETS300102-1	(4)}
 		
 
+
 MAP-DataTypes   DEFINITIONS ::=
 
+BEGIN
 
 -- exports all data types defined in this module
 
@@ -1021,10 +1183,12 @@ IMPORTS
 -- imports upper boundaries for data types
 
 maxSignalInfoLength, maxNumberOfTeleServices,
+maxNumberOfBearerServices, maxNumberOfSupplServices,
 maxNumberOfCUG, maxNumberOfBasicServices,
 maxNumberOfForwardingFeatures, maxNumberOfCallBarringFeatures,
 maxNumberOfHlrId, maxPacketDataVolume,
 maxNumberOfChargingUnit, maxCallDuration,
+maxAddressLength, maxNumberOfSentParameters
 FROM MAP-Constants;
 
 -- common data types
@@ -1032,6 +1196,7 @@ FROM MAP-Constants;
 TBCD-STRING	 ::= OCTET STRING
 		-- digits 0 through 9, two digits per octet,
 		-- each digit encoded 0000 to 1001,
+		-- 1111 used as filler when there is an odd number of digit.
 
 
 AddressString	 ::= OCTET STRING (SIZE (1..maxAddressLength))
@@ -1039,6 +1204,7 @@ AddressString	 ::= OCTET STRING (SIZE (1..maxAddressLength))
 
 IsdnAddressString	 ::= AddressString (SIZE (1..10))
 
+ExternalSignalInfo	 ::= SEQUENCE{
 			protocolId	ProtocolId,
 			signalInfo	SignalInfo}
 
@@ -1046,6 +1212,7 @@ SignalInfo	 ::= OCTET STRING (SIZE (1..maxSignalInfoLength))
 
 ProtocolId	 ::= ENUMERATED{
 		gsm-0408		(1),
+		gsm-0806		(2),
 		gsm-0808-bssmap	(3),
 		isup-Q763		(4)}
 
@@ -1055,6 +1222,7 @@ ProtocolId	 ::= ENUMERATED{
 IMSI	 ::= TBCD-STRING (SIZE (2..8))
 		-- MCC, MNC, MSIN concatenated in this order
 
+TMSI	 ::= OCTET STRING (SIZE (1..4))
 
 
 SubscriberId	 ::= CHOICE {
@@ -1062,6 +1230,7 @@ SubscriberId	 ::= CHOICE {
 		tmsi	[1] IMPLICIT TMSI}
 
 --
+IMEI	 ::= TBCD-STRING (SIZE (8))
 		-- Internal Structure
 		-- Type Approval Code : 6 digits
 		-- manufacturer place : 2 digits
@@ -1069,6 +1238,7 @@ SubscriberId	 ::= CHOICE {
 		-- unassigned : 1 digit
 
 LocAreaId	 ::= OCTET STRING (SIZE (2..5))
+		-- Octets coded according to
 		-- Recommendation GSM 04.08
 		-- Internal structure
 		-- Mobile Country Code	: 3 digits according to Rec E.212
@@ -1076,6 +1246,7 @@ LocAreaId	 ::= OCTET STRING (SIZE (2..5))
 		-- Mobile Network Code	: 2 digits according to Rec E.212
 		-- Location Area Code	: 2 octets according to GSM 04.08
 
+LocationInfo	 ::= CHOICE {
 		roamingNumber	[0] IMPLICIT IsdnAddressString,
 		mscNumber		[1] IMPLICIT IsdnAddressString}
 
@@ -1085,12 +1256,14 @@ HlrId	 ::= IMSI
 HlrList	 ::= SEQUENCE 
 		     SIZE(1.. maxNumberOfHlrId) OF HlrId
 
+
 LMsId	 ::= OCTET STRING (SIZE (4))
 
 
 GlobalCellId	 ::= OCTET STRING (SIZE (5..7))
 		-- Octets coded according to
 		-- Recommendation GSM 04.08
+		-- Internal structure
 		-- Mobile Country Code	: 3 digits according to Rec E.212
 		--		: 1 filler (1111)
 		-- Mobile Network Code	: 2 digits according to Rec E.212
@@ -1098,7 +1271,9 @@ GlobalCellId	 ::= OCTET STRING (SIZE (5..7))
 		-- to GSM 04.08
 		-- Cell identity	: 2 octets (CI) according to GSM 04.08
 
+
 -- data types for subscriber management
+
 --
 Category	 ::= OCTET STRING (SIZE (1))
 		-- internal structure defined in CCITT Rec Q.763
@@ -1106,6 +1281,7 @@ Category	 ::= OCTET STRING (SIZE (1))
 EquipStatus	 ::= ENUMERATED {
 		white-listed	(0),
 		black-listed	(1),
+		grey-listed	(2)}
 
 
 BearerServiceCode	 ::= OCTET STRING (SIZE (1))
@@ -1113,6 +1289,7 @@ BearerServiceCode	 ::= OCTET STRING (SIZE (1))
 		-- BIT 8 Transparency indicator (if applicable)
 		--     0 transparent
 		--     1 non transparent
+
 		-- BIT 7654  Bearer service group
 		--    0001 3.1 kHz ex PLMN
 		--    0010 Circuit data asynchronous
@@ -1120,6 +1297,7 @@ BearerServiceCode	 ::= OCTET STRING (SIZE (1))
 		--    0100 PAD access c.d.a
 		--    0101 Packet data synchrounous
 		--    0110 Alternate speech/c.d.a
+		--    0111 Alternate speech c.d.s
 		--    1000 Speech followed by data c.d.a
 		--    1001 Speech followed by data c.d.s
 		--    1111 12.6 kb/s unrestricted digital
@@ -1127,6 +1305,7 @@ BearerServiceCode	 ::= OCTET STRING (SIZE (1))
 		-- BIT 321  Rate (when applicable)
 		--    000 Any
 		--    001 300-300 b/s
+		--    010 1200-1200 b/s
 		--    011 1200-75 b/s
 		--    100 2400-2400 b/s
 		--    101 4800-4800 b/s
@@ -1134,6 +1313,7 @@ BearerServiceCode	 ::= OCTET STRING (SIZE (1))
 
 
 		-- Bits 321 = 000 can be used to refer to all
+		-- the bearer services of the corresponding group.
 		-- Value "00000000" can be used to refer to all the defined
 		-- bearer services.
 		-- For the codes referring to a group or all bearer services
@@ -1141,15 +1321,58 @@ BearerServiceCode	 ::= OCTET STRING (SIZE (1))
 
 
 BearerServiceList	 ::= SEQUENCE
+		     SIZE(1 .. maxNumberOfBearerServices)
 		     OF BearerServiceCode
 
 
 BearerServiceCode
 
 7564321		Meaning			
+0000000		All bearer services
+
+0001000		3.1 Khz group
+0001001		3.1 Khz ex PLMN
+0001010		alternate/speech
+0001011		speech followed by 3.1 Khz
+
+0010000		Data c.d.a
+0010001		Data c.d.a 300 b/s
+0010010		Data c.d.a 1200 b/s
+0010011		Data c.d.a 1200-75 b/s
+0010100		Data c.d.a 2400 b/s
+0010101		Data c.d.a 4800 b/s
+0010110		Data c.d.a 9600 b/s
+
+0011000		Data c.d.s
+0011010		Data c.d.s 1200 b/s
+0011100		Data c.d.s 2400 b/s
+0011101		Data c.d.s 4800 b/s
+0011110		Data c.d.s 9600 b/s
+
+0100000		PAD access c.d.a
+0100001		PAD access c.d.a 300 b/s
+0100010		PAD access c.d.a 1200 b/s
+0100011		PAD access c.d.a 1200-75 b/s
+0100100		PAD access c.d.a 2400 b/s
+0100101		PAD access c.d.a 4800 b/s
+0100110		PAD access c.d.a 9600 b/s
+
+0101000		Data p.d.s
+0101100		Data p.d.s 2400 b/s
+0101101		Data p.d.s 4800 b/s
+0101110		Data p.d.s 9600 b/s
+
+0110000		Alternate speech/data c.d.a
+0111000		Alternate speech/data c.d.s
+
+1000000		Speech followed by data c.d.a
+1001000		Speech followed by data c.d.s
+
+1111000		12 kb/s Unrestricted Digital
 
 TeleServiceCode
 
+Contents		Meaning			
 00000000		All teleservices
 
 00010000		Speech transmission
@@ -1176,6 +1399,7 @@ TeleServiceCode
 01100001		Facsimile Group 3 and alternate speech
 01100010		Automatic Facsimile Group 3
 
+
 TeleserviceCode	 ::= OCTET STRING (SIZE (1))
 		-- Internal structure according to table 6.4/2
 		-- Bit 8-5 encode the teleservice group
@@ -1183,6 +1407,7 @@ TeleserviceCode	 ::= OCTET STRING (SIZE (1))
 		-- Bit 4-1 = 0000 can be used to refer to all the
 		-- teleservices of the corresponding group.
 		-- Value "00000000" can be used to refer to all the defined
+		-- teleservices
 
 TeleserviceList	 ::= SEQUENCE
 		     SIZE(1 .. maxNumberOfTeleservices)
@@ -1190,6 +1415,7 @@ TeleserviceList	 ::= SEQUENCE
 
 
 BasicServiceCode	 ::= CHOICE {
+		bearerService	[2] IMPLICIT BearerServiceCode,
 		teleservice		[3] IMPLICIT TeleserviceCode}
 
 BasicServiceList	 ::= SEQUENCE
@@ -1197,12 +1423,14 @@ BasicServiceList	 ::= SEQUENCE
 		     OF BasicServiceCode
 
 --
+SubscriberStatus	 ::= ENUMERATED{
 		serviceGranted	(0),
 		operatorOGCallBarring	(1)}
 
 
 SS-Code
 
+Contents		Meaning			
 00010001		Calling number identification presentation
 00010010		Calling number identification restriction
 00010011		Called number identification presentation
@@ -1234,6 +1462,7 @@ SS-Code
 10011010		Barring of all incoming calls
 10011011		Barring of all IC calls when outside HPLMN
 
+-- Data types for supplementary services
 
 SS-Code	 ::= OCTET STRING (SIZE(1))
 		-- Internal structure according to
@@ -1241,6 +1470,7 @@ SS-Code	 ::= OCTET STRING (SIZE(1))
 		-- Bit 8-5
 		-- 0001 Number Identification services
 		-- 0010 Forwarding services
+		-- 0011 Call offering services
 		-- 0100 Call completion services
 		-- 0101 Multi-party services
 		-- 0110 Community of interest services
@@ -1248,6 +1478,7 @@ SS-Code	 ::= OCTET STRING (SIZE(1))
 		-- 1000 Additional information transfer services
 		-- 1001 Call restriction services
 		-- Bit 4-1 = 0000 can be use to refer to
+		-- a group of supplementary services
 		-- eg, "00100000" can be used to refer to all
 		-- forwarding services
 		-- "00101000" can be used to refer to all
@@ -1255,6 +1486,7 @@ SS-Code	 ::= OCTET STRING (SIZE(1))
 		-- "00000000" can be used to refer to all
 		-- supplementary services
 
+SS-CodeList	 ::= SEQUENCE
 		     SIZE(1 .. maxNumberOfSupplServices)
 		     OF SS-Code
 
@@ -1262,6 +1494,7 @@ SS-Code	 ::= OCTET STRING (SIZE(1))
 SS-Status	 ::= OCTET STRING (SIZE (1))
 		-- Bit 8-4 Unused
 		-- Bit 3   Provision indicator
+		--     0 : Not provisioned
 		--     1 : Provisioned
 		-- Bit 2   Registration indicator (if applicable)
 		--     0 : Not Registered
@@ -1269,6 +1502,7 @@ SS-Status	 ::= OCTET STRING (SIZE (1))
 		-- Bit 1   Activation indicator (If applicable)
 		--     0 : Not Active
 		--     1 : Active
+
 SS-Information	 ::= CHOICE{
 		forwardingInfo	[0] IMPLICIT ForwardingInfo,
 		callBarringInfo	[1] IMPLICIT CallBarringInfo,
@@ -1276,6 +1510,7 @@ SS-Information	 ::= CHOICE{
 		ss-Data		[3] IMPLICIT SS-Data}
 
 SS-InfoList	 ::= SEQUENCE
+		     SIZE(1 .. maxNumberOfSupplServices)
 		     OF SS-Information
 
 
@@ -1285,12 +1520,14 @@ SS-Data	 ::= SEQUENCE{
 	ss-Status		[4] IMPLICIT SS-Status OPTIONAL,
 	ss-SubscriptionOption	SS-SubscriptionOption OPTIONAL}
 
+
 SS-DataList	 ::= SEQUENCE
 		     SIZE(1 .. maxNumberOfSupplServices)
 		     OF SS-Data
 
 
 SS-Request	 ::= ENUMERATED{
+		registration (0),
 		erasure (1),
 		activation (2),
 		deactivation(3),
@@ -1298,6 +1535,7 @@ SS-Request	 ::= ENUMERATED{
 		invoke (5)}
 
 
+SS-SubscriptionOption	 ::= CHOICE{
 	perCallBasis			[5] IMPLICIT BOOLEAN,
 	notificationToHeldRetrievedParty	[6] IMPLICIT BOOLEAN,
 	userToUserServiceIndicator	[7] IMPLICIT UserToUserServiceIndicator,
@@ -1305,6 +1543,7 @@ SS-Request	 ::= ENUMERATED{
 	huntGroupAccessSelectionOrder	[9] IMPLICIT HuntGroupAccessSelectionOrder}
 
 
+
 ForwardingOptions	 ::= OCTET STRING (SIZE(1))
 		-- Bit 8-7  Notification to forwarding party
 		--          00  No notification
@@ -1312,6 +1551,7 @@ ForwardingOptions	 ::= OCTET STRING (SIZE(1))
 		--          10  notification without calling number identity
 		-- Bit 6-5  Notification to calling party
 		--          00 No notification
+		--          01 Notification with forwarded-to number
 		--          10 Notification without forwarded-to number
 
 
@@ -1319,6 +1559,7 @@ UserToUserServiceIndicator	 ::= OCTET STRING (SIZE(1))
 		-- Bit 8   : service 1
 		-- Bit 7   : service 2
 		-- Bit 6   : service 3
+		-- Bit 5-1 : Reserved
 		-- Bit 8 to 6 coded "1" if the service
 		-- is available to the subscriber
 
@@ -1326,7 +1567,9 @@ UserToUserServiceIndicator	 ::= OCTET STRING (SIZE(1))
 MaximumConfereesNumber	 ::= INTEGER (1..10)
 
 
+
 HuntGroupAccessSelectionOrder ::= ENUMERATED{
+		random	(0),
 		sequential	(1)}
 
 
@@ -1334,6 +1577,7 @@ NoReplyConditionTime	 ::= INTEGER (5..30)
 
 
 
+NumberOfConferees	 ::= INTEGER (1..10)
 
 
 CUG-Facilities	 ::=  OCTET STRING (SIZE (1))
@@ -1341,6 +1585,7 @@ CUG-Facilities	 ::=  OCTET STRING (SIZE (1))
 		-- Bit 2-1
 		--   00 CUG only facilities
 		--   01 CUG with outgoing access
+		--   10 CUG with incoming access
 		--   11 CUG with both outgoing and incoming access
 
 CUG-Interlock	 ::= OCTET STRING (SIZE (4))
@@ -1348,6 +1593,7 @@ CUG-Interlock	 ::= OCTET STRING (SIZE (4))
 
 CUG-Index	 ::=  OCTET STRING (SIZE (1))
 		-- Internal structure defined in Rec CCITT Q.763
+
 CUG-Options	 ::=  OCTET STRING (SIZE (1))
 		-- BIT 8-4 00000 (Unused)
 		-- BIT 3 preferential CUG indicator
@@ -1355,6 +1601,7 @@ CUG-Options	 ::=  OCTET STRING (SIZE (1))
 		-- 1 preferential CUG
 		-- BIT 2 barring of incoming calls within the CUG
 		-- 0 no barring
+		-- 1 barring
 		-- BIT 1 barring of outgoing calls within the CUG
 		-- 0 no barring
 		-- 1 barring
@@ -1362,13 +1609,16 @@ CUG-Options	 ::=  OCTET STRING (SIZE (1))
 CUG-Feature	 ::= SEQUENCE {
 	cug-interlock		CUG-Interlock,
 	cug-Index		CUG-Index,
+	cug-Options		CUG-Options,
 	ss-Status		SS-Status}
 
 
 CUG-FeatureList ::= 	SEQUENCE SIZE (
 		1..maxNumberOfCUG) OF CUG-Feature
 
+
 CUG-Information	 ::= SEQUENCE{
+	cug-Facilities	CUG-Facilities,
 			CHOICE{
 	cug-Feature			[0] IMPLICIT CUG-Feature,
 	cug-FeatureList		[1] IMPLICIT CUG-FeatureList}}
@@ -1376,6 +1626,7 @@ CUG-Information	 ::= SEQUENCE{
 		-- for the preferred CUG.
 
 --
+ForwardingInfo	 ::= SEQUENCE{
 	ss-Code		SS-Code OPTIONAL,
 	forwardingFeatureList	ForwardingFeatureList}
 
@@ -1383,12 +1634,14 @@ ForwardingData	 ::= SEQUENCE{
 	forwardedToNumber	[5] IMPLICIT IsdnAddressString,
 	forwardingOptions	[6] IMPLICIT ForwardingOptions OPTIONAL}
 
+
 ForwardingFeature	 ::=  SEQUENCE {
 	basicService	BasicServiceCode OPTIONAL,
 	ss-Status		[4] IMPLICIT SS-Status,
 	forwardedToNumber	[5] IMPLICIT IsdnAddressString OPTIONAL,
 	forwardingOptions	[6] IMPLICIT ForwardingOptions OPTIONAL,
 	noReplyConditionTime	[7] IMPLICIT NoReplyConditionTime  OPTIONAL}
+
 ForwardingFeatureList	 ::= SEQUENCE SIZE (1.. maxNumberOfForwardingFeatures) 
 	OF ForwardingFeature
 
@@ -1396,17 +1649,21 @@ CallBarringInfo	 ::= SEQUENCE {
 	ss-Code		SS-Code,
 	callBarringFeatureList	CallBarringFeatureList}
 
+CallBarringFeature	 ::= SEQUENCE{
 	basicServiceCode	BasicServiceCode OPTIONAL,
 	ss-Status		[4] IMPLICIT SS-Status }
 
 CallBarringFeatureList	 ::= SEQUENCE SIZE (1.. maxNumberOfCallBarringFeatures) 
 OF CallBarringFeature
+
 SubscriberData	 ::= SEQUENCE{
 	msIsdn			[1] IMPLICIT IsdnAddressString OPTIONAL,
 	category			[2] IMPLICIT Category OPTIONAL,
 	subscriberStatus		[3] IMPLICIT SubscriberStatus OPTIONAL,
 	bearerServiceList		[4] IMPLICIT BearerServiceList OPTIONAL,
 	teleserviceList		[6] IMPLICIT TeleserviceList OPTIONAL, 	
+	provisonedSupplServices		[7] IMPLICIT SS-InfoList OPTIONAL}
+
 
 SS-Notification	 ::= OCTET STRING (SIZE (1))
 		-- 1 bit per defined indication
@@ -1415,6 +1672,7 @@ SS-Notification	 ::= OCTET STRING (SIZE (1))
 Password	 ::= CHOICE {
 		PrintableString (SIZE(4..8)),
 		NumericString (FROM (
+		"0"|"1"|"2"|"3"|"4"|
 		"5"|"6"|"7"|"8"|"9")|
 		SIZE(4))}
 		-- only the second form is used for GSM systems.
@@ -1422,6 +1680,7 @@ Password	 ::= CHOICE {
 
 GuidanceInfo	 ::=   ENUMERATED{
 		guidance0 (0),
+		guidance1 (1),
 		guidance2 (2),
 		guidance3 (3),
 		guidance4 (4)}
@@ -1429,18 +1688,21 @@ GuidanceInfo	 ::=   ENUMERATED{
 		-- the identifiers used in this description represent
 		-- the information which has to be delivered to the subscriber
 		-- according to table 6.4/4.
+		-- How this information is really delivered to the subscriber
 		-- (display, announcement, ...) is not part of this specification.
 
 SS-UserData	 ::= IA5String (SIZE (1.. maxSignalInfoLength))
 
 
 number		Information to be provided	
+
 guidance0		enter password
 guidance1		enter new password
 guidance2		enter new password again
 guidance3		bad password try again
 guidance4		bad password format try again
 
+
 -- Data types for call parameters
 
 CallReference	 ::= OCTET STRING (SIZE (1..3))
@@ -1448,6 +1710,7 @@ CallReference	 ::= OCTET STRING (SIZE (1..3))
 CallType	 ::= ENUMERATED{
 		incomingCall	(0),
 		forwardedCallPortion	(1),
+		reroutedCallPortion	(2),
 		outgoingCall		(3),
 		ss-Request		(4)}
 
@@ -1455,6 +1718,7 @@ SS-ChargingData	 ::= SEQUENCE {
 	ss-Code	[1] IMPLICIT SS-Code,
 	ss-Request	[2] IMPLICIT SS-Request,
 	charge	[3] IMPLICIT Charge OPTIONAL}
+
 SS-ChargingInfo	 ::= SEQUENCE
 		     SIZE(1..maxNumberOfSupplServices)
 		     OF SS-ChargingData
@@ -1462,6 +1726,7 @@ SS-ChargingInfo	 ::= SEQUENCE
 CallDuration	 ::= INTEGER (0..maxCallDuration)
 
 CallDateTime	 ::= GeneralizedTime (SIZE (14 .. 24))
+		-- local time and time differential
 		-- to UTC time
 
 PacketDataVolume	 ::= INTEGER (1..maxPacketDataVolume)
@@ -1469,6 +1734,7 @@ PacketDataVolume	 ::= INTEGER (1..maxPacketDataVolume)
 Charge	 ::= INTEGER (1.. maxNumberOfChargingUnit)
 
 ChargingUnit	 ::= ENUMERATED {
+		specialDrawingRights (0)}
 
 CallStatus	 ::= ENUMERATED
 		{undetermined 			(0),
@@ -1476,6 +1742,7 @@ CallStatus	 ::= ENUMERATED
 		successfulAbnormalTermination		(2),
 		forwarded				(4),
 		forwardedWithAbnormalTermination		(5),
+		rerouted				(6),
 		reroutedWithAbnormalTermination 		(7),
 		unsuccessfulNoRadioContact 		(8),
 		unsuccessfulNoResponse		(9),
@@ -1483,6 +1750,7 @@ CallStatus	 ::= ENUMERATED
 		unsuccessfulSystemFailed 		(11),
 		unsuccessfulSusbcriptionViolation 		(12),
 		unsuccessfulUnsupportedFacility 		(13)}
+
 NumberOfForwarding	 ::= INTEGER (1..5)
 
 
@@ -1491,6 +1759,7 @@ NumberOfForwarding	 ::= INTEGER (1..5)
 ChannelType	 ::= OCTET STRING (SIZE (1..10))
 		-- Concatenation of
 		-- Speech data indicator
+		-- Channel rate
 		-- Speech encoding algorithm/data rate
 		-- + transparency indicator
 		-- as defined in Recommendation GSM 08.08
@@ -1498,6 +1767,7 @@ ChannelType	 ::= OCTET STRING (SIZE (1..10))
 
 ClassmarkInformation	 ::= OCTET STRING (SIZE (1..2))
 		-- classmark information element type 1 or 2
+		-- contents as defined in Recommendation 08.08
 
 
 HandoverPriority	 ::= OCTET STRING (SIZE (1))
@@ -1505,6 +1775,7 @@ HandoverPriority	 ::= OCTET STRING (SIZE (1))
 
 
 
+
 HandoverType	 ::= ENUMERATED
 		{interBSS (0),
 		 intraBSS (1)}
@@ -1512,6 +1783,7 @@ HandoverType	 ::= ENUMERATED
 
 -- Data types for security procedures
 
+AuthenticationSet	 ::= SEQUENCE {
 	rand	Rand,
 	sres	Sres,
 	kc	Kc}
@@ -1519,6 +1791,7 @@ HandoverType	 ::= ENUMERATED
 
 Rand	 ::= OCTET STRING (SIZE (16))
 
+Sres	 ::= OCTET STRING (SIZE (4))
 
 Kc	 ::= OCTET STRING (SIZE (8))
 
@@ -1526,6 +1799,7 @@ Ki	 ::= OCTET STRING (SIZE (16))
 
 CKSN	 ::= OCTET STRING (SIZE (1))
 		-- bits 8-4 unused
+		-- bits 3-1 coded as specified in recommendation GSM 04.08
 
 
 CipheringMode	 ::= ENUMERATED{
@@ -1533,7 +1807,9 @@ CipheringMode	 ::= ENUMERATED{
 		version1-GSM (2)}
 
 
+
 -- Data types for short message services
+
 SM-RP-DA	 ::= CHOICE{
 	imsi		[0] IMPLICIT IMSI,
 	lMsId		[1] IMPLICIT LMsId,
@@ -1541,6 +1817,7 @@ SM-RP-DA	 ::= CHOICE{
 	serviceCentreAddress	[4] IMPLICIT AddressString}
 
 
+SM-RP-OA	 ::= CHOICE{
 	msIsdn		[2] IMPLICIT IsdnAddressString,
 	serviceCentreAddress	[4] IMPLICIT AddressString}
 
@@ -1548,6 +1825,7 @@ SM-RP-DA	 ::= CHOICE{
 SM-RP-UI	 ::= OCTET STRING (SIZE (1..maxSignalInfoLength))
 
 Figure 6.4/9 
+ASN.1 Specification of MAP data types: short messages
 
 -- fault recovery, call tracing
 
@@ -1555,6 +1833,7 @@ TraceReference	 ::= OCTET STRING (SIZE (1..2))
 
 TraceType	 ::= INTEGER{
 		allEvents (0),
+		onlyCalls (1),
 		eventSet1 (2),
 		eventSet254 (255)}
 		(0..255)
@@ -1562,12 +1841,15 @@ TraceType	 ::= INTEGER{
 		-- sets of events pre-defined by each operator.
 
 NetworkResource	 ::= ENUMERATED
+		{pLMN		(0),
 		hLR		(1),
 		vLR 		(2),
 		previous-VLR 	(3),
 		controlling-MSC 	(4),
 		vMSC 		(5),
 		eIR 		(6),
+		radioSubSystem	(7)}
+
 
 -- other data types
 
@@ -1576,6 +1858,7 @@ RequestParameter	 ::= ENUMERATED{
 		request-AuthenticationSet 	(1),
 		request-SubscriberData 		(2),
 		request-CUG-Information 	(3),
+		request-Ki 			(4)}
 
 RequestParameters	 ::= SEQUENCE SIZE (1..2) OF RequestParameter
 
@@ -1583,6 +1866,7 @@ SentParameter	 ::= CHOICE{
 	imsi		[0] IMPLICIT IMSI,
 	authenticationSet	[1] IMPLICIT AuthenticationSet,
 	susbcriberData	[2] IMPLICIT SubscriberData,
+	cug-information	[3] IMPLICIT CUG-Information,
 	ki		[4] IMPLICIT Ki}
 	
 
@@ -1590,6 +1874,7 @@ SentParameters	 ::= SEQUENCE
 		     SIZE(1..maxNumberOfSentParameters)
 		     OF SentParameter
 
+
 CmServiceType	 ::= ENUMERATED{
 		mobileOriginatingCall			(1),
 		emergencyCallEstablishment 		(2),
@@ -1597,6 +1882,7 @@ CmServiceType	 ::= ENUMERATED{
 		ss-request 				(8),
 		mobileOriginatingCallRe-establishment	(9),
 		mobileTerminatingCall 			(10)}
+
 --
 AccessConnectionStatus	 ::= OCTET STRING (SIZE (1))
 		-- Bit 8-4 Reserved
@@ -1604,18 +1890,21 @@ AccessConnectionStatus	 ::= OCTET STRING (SIZE (1))
 		--     0 No RR- connection
 		--     1 RR-connection established
 		-- Bit 2
+		--     0 Ciphering mode off
 		--     1 Ciphering mode on
 		-- Bit 1
 		--     0 MM-connection existing and authenticated
 		--     1 MM-connection existing and not authenticated
 
 END -- End of data types specifications
+
 -	Undetermined
 -	Successful with normal termination
 -	Successful with abnormal termination
 -	Spare
 -	Forwarded
 -	Forwarded with abnormal termination
+-	Rerouted
 -	Rerouted with abnormal termination
 -	Unsuccessful due to no radio contact
 -	Unsuccessful due to no response
@@ -1629,6 +1918,7 @@ BEGIN
 
 IMPORTS
 maxSignalInfoLength FROM MAP-Constants;
+   
 MAPAbortInformation	 ::= SEQUENCE{
 		abortCause ENUMERATED{
 			unspecifiedReason (0),
@@ -1636,6 +1926,7 @@ MAPAbortInformation	 ::= SEQUENCE{
 			userResourceLimitation (2),
 			resourceUnavailableLongTermProblem (3),
 			resourceUnavailableTemporaryProblem (4),
+			radioChannelRelease (5),
 			networkPathRelease (6),
 			callRelease (7),
 			associatedProcedureFailed (8),
@@ -1643,6 +1934,7 @@ MAPAbortInformation	 ::= SEQUENCE{
 		additionalInformation OCTET STRING (SIZE(
 			1..MaxSignalInfoLength))}
 		--
+		-- The internal structure of the OCTET STRING
 		-- is up to the operator
 		
 END
@@ -1652,6 +1944,7 @@ MAP-Protocol DEFINITIONS ::=
 BEGIN
 IMPORTS
 
+-- Imports operation types
 
 -- Location management
 UpdateLocationArea, UpdateLocation, CancelLocation,
@@ -1659,6 +1952,7 @@ DetachIMSI, AttachIMSI, DeregisterMobileSubscriber,
 
 -- Data management
 SendParameters, InsertSubscriberData, DeleteSubscriberData,
+
 -- Supplementary Services Handling
 RegisterSS, EraseSS, ActivateSS,
 DeactivateSS, InterrogateSS, InvokeSS, ForwardSsNotification,
@@ -1666,6 +1960,7 @@ RegisterPassword, GetPassword, ProcessUnstructuredSsData,
 
 -- Call set-up
 SendInfoForIncomingCall, SendInfoForOutgoingCall, SendRoutingInformation, ProvideRoamingNumber,
+CompleteCall, ConnectToFollowingAddress, ProcessCallWaiting
 
 -- Paging
  Page, SearchForMobileSubscriber,
@@ -1673,6 +1968,8 @@ SendInfoForIncomingCall, SendInfoForOutgoingCall, SendRoutingInformation, Provid
 -- Handover
 PerformHandover, SendEndSignal,
 PerformSubsequentHandover, AllocateHandoverNumber, SendHandoverReport,
+ProcessAccessSignalling, ForwardAccessSignalling, NoteInternalHandover,
+
 
 -- Charging
 RegisterChargingInformation,
@@ -1681,6 +1978,7 @@ RegisterChargingInformation,
 Reset, ForwardCheckSsIndication,
 
 -- Authentication and security
+Authenticate, ProvideIMSI,
 ForwardNewTMSI, SetCipheringMode,
 
 
@@ -1688,6 +1986,7 @@ ForwardNewTMSI, SetCipheringMode,
 CheckIMEI,
 
 -- Short messages
+SendRoutingForShortMsg, ForwardShortMessage, SetMessageWaitingData,
 NoteMSPresent, AlertServiceCentre,
 
 -- Tracing
@@ -1695,6 +1994,7 @@ ActivateTraceMode, DeactivateTraceMode, TraceSubscriberActivity,
 
 -- Others
 ProcessAccessRequest
+BeginSubscriberActivity
 FROM MAP-Operations
 
 -- imports error types
@@ -1702,6 +2002,7 @@ FROM MAP-Operations
 UnknownSubscriber, UnknownBaseStation,UnknownMSC,
 UnknownLocArea, UnidentifiedSubscriber,
 UnallocatedRoamingNumber, UnknownEquipment, RoamingNotAllowed,
+IllegalMS, BearerServiceNotProvisioned,
 TeleserviceNotProvisioned, InsufficientBearerCapabilities,
 CallBarred, ForwardingViolation, CUG-Reject,
 IllegalSS-Operation, SS-ErrorStatus, SS-NotAvailable,
@@ -1709,12 +2010,15 @@ SS-SubscriptionViolation, SS-Incompatibility, FacilityNotSupported, InvalidTarge
 NoHandoverNumberAvailable,
 SubsequentHandoverFailure, AbsentSubscriber,
 BusySubscriber, NoSubscriberReply, RadioCongestion,
+ImpossibleCallCompletion, SM-DeliveryFailure, MessageWaitingListFull, SystemFailure, DataMissing,
 UnexpectedDataValue, PasswordRegistrationFailure,
 NegativePasswordCheck, NoRoamingNumberAvailable,
 TracingBufferFull
 FROM MAP-Errors;
 
+
 -- allocation of local value to operations
+
 updateLocationArea UpdateLocationArea ::= 1
 
 updateLocation UpdateLocation ::= 2
@@ -1722,6 +2026,7 @@ updateLocation UpdateLocation ::= 2
 cancelLocation CancelLocation ::= 3
 
 provideRoamingNumber ProvideRoamingNumber ::= 4
+
 detachIMSI DetachIMSI ::= 5
 
 attachIMSI AttachIMSI ::= 6
@@ -1729,6 +2034,7 @@ attachIMSI AttachIMSI ::= 6
 insertSubscriberData InsertSubscriberData ::= 7
 
 deleteSubscriberData DeleteSubscriberData ::= 8
+
 sendParameters SendParameters ::= 9
 
 registerSS RegisterSS ::= 10
@@ -1736,6 +2042,7 @@ registerSS RegisterSS ::= 10
 eraseSS EraseSS ::= 11
 
 activateSS ActivateSS ::= 12
+
 deactivateSS DeactivateSS ::= 13
 
 interrogateSS InterrogateSS ::= 14
@@ -1743,6 +2050,7 @@ interrogateSS InterrogateSS ::= 14
 invokeSS InvokeSS ::= 15
 
 forwardSsNotification ForwardSsNotification ::= 16
+
 registerPassword RegisterPassword ::= 17
 
 getPassword GetPassword ::= 18
@@ -1750,6 +2058,7 @@ getPassword GetPassword ::= 18
 processUnstructuredSsData ::= 19
 
 sendInfoForIncomingCall SendInfoForIncomingCall ::= 20
+
 sendInfoForOutgoingCall SendInfoForOutgoingCall ::= 21
 
 sendRoutingInformation SendRoutingInformation ::= 22
@@ -1757,6 +2066,7 @@ sendRoutingInformation SendRoutingInformation ::= 22
 completeCall CompleteCall ::= 23
 
 connectToFollowingAddress ConnectToFollowingAddress ::= 24
+
 processCallWaiting ProcessCallWaiting ::= 25
 
 
@@ -1765,6 +2075,7 @@ page Page ::= 26
 searchForMobileSubscriber SearchForMobileSubscriber ::= 27
 
 performHandover PerformHandover ::= 28
+
 sendEndSignal SendEndSignal ::= 29
 
 performSubsequentHandover PerformSubsequentHandover ::= 30
@@ -1772,6 +2083,7 @@ performSubsequentHandover PerformSubsequentHandover ::= 30
 allocateHandoverNumber AllocateHandoverNumber ::= 31
 
 sendHandoverReport SendHandoverReport ::= 32
+
 processAccessSignalling ProcessAccessSignalling ::= 33
 
 forwardAccessSignalling ForwardAccessSignalling ::= 34
@@ -1779,6 +2091,7 @@ forwardAccessSignalling ForwardAccessSignalling ::= 34
 noteInternalHandover NoteInternalHandover ::= 35
 
 registerChargingInformation RegisterChargingInformation ::= 36
+
 reset Reset ::= 37
 
 forwardCheckSsIndication ForwardCheckSsIndication ::= 38
@@ -1786,6 +2099,7 @@ forwardCheckSsIndication ForwardCheckSsIndication ::= 38
 authenticate Authenticate ::= 39
 
 provideIMSi ProvideIMSI ::= 40
+
 forwardNewTMSI ForwardNewTMSI ::= 41
 
 setCipheringMode SetCipheringMode ::= 42
@@ -1793,6 +2107,7 @@ setCipheringMode SetCipheringMode ::= 42
 checkIMEI CheckIMEI ::= 43
 
 sendRoutingInfoForSM SendRoutingInfoForSM ::= 45
+
 forwardShortMessage ForwardShortMessage ::= 46
 
 setMessageWaitingData SetMessageWaitingData ::= 47
@@ -1800,13 +2115,16 @@ setMessageWaitingData SetMessageWaitingData ::= 47
 noteMSPresent NoteMsPresent ::= 48
 
 alertServiceCentre AlertServiceCentre ::= 49
+
 activateTraceMode ActivateTraceMode ::= 50
 
 deactivateTraceMode DeactivateTraceMode ::= 51
 
 traceSubscriberActivity TraceSubscriberActivity ::= 52
 
+
 processAccessRequest ProcessAccessRequest ::= 53
+
 beginSubscriberActivity BeginSubscriberActivity ::= 54
 
 --
@@ -1814,6 +2132,7 @@ beginSubscriberActivity BeginSubscriberActivity ::= 54
 
 unknownSubscriber UnknownSubscriber ::= 1
 
+unknownBaseStation UnknownBaseStation ::= 2
 
 unknownMSC UnknownMSC ::= 3
 
@@ -1821,6 +2140,7 @@ unknownLocArea UnknownLocArea ::= 4
 
 unidentifiedSubscriber UnidentifiedSubscriber ::= 5
 
+unallocatedRoamingNumber UnallocatedRoamingNumber ::= 6
 
 unknownEquipment UnknownEquipment ::= 7
 
@@ -1828,6 +2148,7 @@ roamingNotAllowed RoamingNotAllowed ::= 8
 
 illegalMS IllegalMS ::= 9
 
+bearerServiceNotProvisioned BearerServiceNotProvisioned ::= 10
 
 teleServiceNotProvisioned TeleServiceNotProvisioned ::= 11
 
@@ -1835,6 +2156,7 @@ insufficientBearerCapabilities InsufficientBearerCapabilities ::= 12
 
 callBarred CallBarred ::= 13
 
+forwardingViolation ForwardingViolation ::= 14
 
 cug-Reject CUG-Reject ::= 15
 
@@ -1842,6 +2164,7 @@ illegalSS-Operation IllegalSS-Operation ::= 16
 
 ss-ErrorStatus SS-ErrorStatus ::= 17
 
+ss-NotAvailable SS-NotAvailable ::= 18
 
 ss-SubscriptionViolation SS-SubscriptionViolation ::= 19
 
@@ -1849,7 +2172,9 @@ ss-Incompatibility SS-Incompatibility ::= 20
 
 facilityNotSupported FacilityNotSupported ::= 21
 
+invalidTargetBaseStation InvalidTargetBaseStation  ::= 23
 
+noRadioResourceAvailable NoRadioResourceAvailable ::= 24
 
 noHandoverNumberAvailable NoHandoverNumberAvailable ::= 25
 
@@ -1857,6 +2182,7 @@ subsequentHandoverFailure SubsequentHandoverFailure ::= 26
 
 absentSubscriber AbsentSubscriber ::= 27
 
+busySubscriber BusySubscriber ::= 28
 
 noSubscriberReply NoSubscriberReply ::= 29
 
@@ -1864,6 +2190,7 @@ radioCongestion RadioCongestion ::= 30
 
 impossibleCallCompletion ImpossibleCallCompletion ::= 31
 
+sm-DeliveryFailure SM-DeliveryFailure ::= 32
 
 MessageWaitingListFull ::= 33
 
@@ -1871,6 +2198,7 @@ systemFailure SystemFailure ::= 34
 
 dataMissing DataMissing ::= 35
 
+unexpectedDataValue UnexpectedDataValue ::= 36
 
 passwordRegistrationFailure PasswordRegistrationFailure :: 37
 
@@ -1878,6 +2206,7 @@ negativePasswordCheck NegativePasswordCheck ::= 38
 
 noRoamingNumberAvailable NoRoamingNumberAvailable ::= 39
 
+tracingBufferFull TracingBufferFull ::= 40
 
 
 END
diff --git a/output/420-s14.asn1 b/output/420-s14.asn1
new file mode 100644
index 0000000..89990bb
--- /dev/null
+++ b/output/420-s14.asn1
@@ -0,0 +1,3382 @@
+--- MODULE 'MobileDomainDefinitions' START ---
+MobileDomainDefinitions {
+   ccitt (0) identified-organization (4) etsi (0) mobileDomainId (0)
+   mobileDomainDefinitions (0) version1 (1)}
+
+DEFINITIONS
+
+::=
+
+BEGIN
+
+-- Mobile Domain
+
+mobileDomain  OBJECT IDENTIFIER ::=
+	{ccitt (0) identified-organization (4) etsi (0) mobileDomainId (0)}
+
+
+-- Mobile Subdomains
+
+gsm-Network  OBJECT IDENTIFIER ::=
+	{mobileDomain gsm-NetworkId (1)}
+
+gsm-Access  OBJECT IDENTIFIER ::=
+	{mobileDomain gsm-AccessId (2)}
+
+gsm-OperationAndMaintenance  OBJECT IDENTIFIER ::=
+	{mobileDomain gsm-Operation-MaintenanceId (3)}
+
+gsm-Messaging  OBJECT IDENTIFIER ::=
+	{mobileDomain gsm-MessagingId (4)}
+
+
+
+CommonComponentId ::= INTEGER (0..9)
+
+ac-Id  CommonComponentId ::= 0
+
+as-Id  CommonComponentId ::= 1
+
+ase-Id  CommonComponentId ::= 2
+
+moduleId  CommonComponentId ::= 3
+
+er-Id  CommonComponentId ::= 4
+
+
+--- MODULE END ---
+
+--- MODULE 'MAP-Frame' START ---
+MAP-Frame
+
+DEFINITIONS ::=
+
+BEGIN
+
+IMPORTS
+	Component,
+	MessageType
+FROM TCAPMessages
+
+	dialogue-as-id,
+	DialoguePDU
+FROM DialoguePDUs
+
+	updateLocation
+FROM MAP-Protocol
+
+	map-DialogueAS,
+	MAP-DialoguePDU
+FROM MAP-DialogueInformation
+
+	map-ac
+FROM MAP-ApplicationContexts
+;
+
+
+ZZZZ-Dummy ::= NULL
+
+
+--- MODULE END ---
+
+--- MODULE 'MAP-ApplicationContext' START ---
+MAP-ApplicationContext {
+   ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
+   moduleId (3) map-ApplicationContext (2) version2 (2)}
+
+DEFINITIONS
+
+::=
+
+BEGIN
+
+
+-- EXPORTS everything
+
+
+IMPORTS
+	gsm-Network,
+	ac-Id
+FROM MobileDomainDefinitions {
+   ccitt (0) identified-organization (4) etsi (0) mobileDomainId (0)
+   mobileDomainDefinitions (0) version1 (1)}
+;
+
+-- application-context-names
+
+  OBJECT IDENTIFIER ::= {gsm-Network ac-Id}
+
+
+networkLocUpContext-v2  OBJECT IDENTIFIER ::=
+	{map-ac networkLocUp(1) version2(2)}
+networkLocUpContext-v1  OBJECT IDENTIFIER ::=
+	{map-ac networkLocUp(1) version1(1)}
+
+locationCancellation-v2  OBJECT IDENTIFIER ::=
+	{map-ac locationCancel(2) version2(2)}
+locationCancellation-v1  OBJECT IDENTIFIER ::=
+	{map-ac locationCancel(2) version1(1)}
+
+roamingNumberEnquiryContext-v2  OBJECT IDENTIFIER ::=
+	{map-ac roamingNbEnquiry(3) version2(2)}
+roamingNumberEnquiryContext-v1  OBJECT IDENTIFIER ::=
+	{map-ac roamingNbEnquiry(3) version1(1)}
+
+locationInfoRetrievalContext-v2  OBJECT IDENTIFIER ::=
+	{map-ac locInfoRetrieval(5) version2(2)}
+locationInfoRetrievalContext-v1resetContext-v2  OBJECT IDENTIFIER ::=
+	{map-ac reset(10) version2(2)}
+resetContext-v1  OBJECT IDENTIFIER ::=
+	{map-ac reset(10) version1(1)}
+
+handoverControlContext-v2  OBJECT IDENTIFIER ::=
+	{map-ac handoverControl(11) version2(2)}
+handoverControlContext-v1  OBJECT IDENTIFIER ::=
+	{map-ac handoverControl(11) version1(1)}
+
+equipmentMngtContext-v2  OBJECT IDENTIFIER ::=
+	{map-ac equipmentMngt(13) version2(2)}
+equipmentMngtContext-v1  OBJECT IDENTIFIER ::=
+	{map-ac equipmentMngt(13) version1(1)}
+
+infoRetrievalContext-v2  OBJECT IDENTIFIER ::=
+	{map-ac infoRetrieval (14) version2(2)}
+infoRetrievalContext-v1  OBJECT IDENTIFIER ::=
+	{map-ac infoRetrieval(14) version1(1)}
+
+  OBJECT IDENTIFIER ::=
+	{map-ac interVlrInfoRetrieval (15) version2(2)}
+
+subscriberDataMngtContext-v2  OBJECT IDENTIFIER ::=
+	{map-ac subscriberDataMngt (16) version2(2)}
+subscriberDataMngtContext-v1  OBJECT IDENTIFIER ::=
+	{map-ac subscriberDataMngt (16) version1(1)}
+
+tracingContext-v2  OBJECT IDENTIFIER ::=
+	{map-ac tracing(17) version2(2)}
+tracingContext-v1  OBJECT IDENTIFIER ::=
+	{map-ac tracing(17) version1(1)}
+
+networkFunctionalSsContext-v2  OBJECT IDENTIFIER ::=
+	{map-ac networkFunctionalSs(18) version2(2)}
+networkFunctionalSsContext-v1  OBJECT IDENTIFIER ::=
+	{map-ac networkFunctionalSs(18) version1(1)}
+
+networkUnstructuredSsContext-v2  OBJECT IDENTIFIER ::=
+	{map-ac networkUnstructuredSs(19) version2(2)}
+networkUnstructuredSsContext-v1shortMsgGatewayContext-v2  OBJECT IDENTIFIER ::=
+	{map-ac shortMsgGateway (20) version2(2)}
+shortMsgGatewayContext-v1  OBJECT IDENTIFIER ::=
+	{map-ac shortMsgGateway(20) version1(1)}
+
+shortMsgMO-RelayContext-v2  OBJECT IDENTIFIER ::=
+	{map-ac shortMsgMO-Relay (21) version2(2)}
+shortMsgRelayContext-v1  OBJECT IDENTIFIER ::=
+	{map-ac shortMsgMO-Relay(21) version1(1)}
+
+mwdMngtContext-v2  OBJECT IDENTIFIER ::=
+	{map-ac mwdMngtContext(24) version2(2)}
+mwdMngtContext-v1  OBJECT IDENTIFIER ::=
+	{map-ac mwdMngtContext(24) version1(1)}
+
+shortMsgMT-RelayContext-v2  OBJECT IDENTIFIER ::=
+	{map-ac shortMsgMT-Relay (25) version2(2)}
+
+
+--- MODULE 'MAP-DialogueInformation' START ---
+MAP-DialogueInformation {
+   ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
+   moduleId (3) map-DialogueInformation (3) version2 (2)}
+
+DEFINITIONS
+
+IMPLICIT TAGS
+
+::=
+
+BEGIN
+
+IMPORTS
+	gsm-Network,
+	as-Id
+FROM MobileDomainDefinitions {
+   ccitt (0) identified-organization (4) etsi (0) mobileDomainId (0)
+   mobileDomainDefinitions (0) version1 (1)}
+
+	AddressString
+FROM MAP-CommonDataTypes {
+   ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
+   moduleId (3) map-CommonDataTypes (18) version2 (2)}
+;
+
+
+-- abstract syntax name for MAP-DialoguePDU
+
+map-DialogueAS  OBJECT IDENTIFIER ::=
+	{gsm-Network as-Id map-DialoguePDU (1) version1 (1)}
+
+MAP-DialoguePDU ::= CHOICE {
+	map-open	[0] MAP-OpenInfo,
+	map-accept	[1] MAP-AcceptInfo,
+	map-close	[2] MAP-CloseInfo,
+	map-refuse	[3] MAP-RefuseInfo,
+	map-userAbort	[4] MAP-UserAbortInfo,
+	map-providerAbort	[5] MAP-ProviderAbortInfo}
+
+MAP-OpenInfo ::= SEQUENCE {
+	destinationReference	[0] AddressString	OPTIONAL,
+	originationReference	[1] AddressString	OPTIONAL,
+	plmn-specificInfo	[2] EXTERNAL	OPTIONAL}
+
+MAP-AcceptInfo ::= SEQUENCE {
+	plmn-specificInfo	[0] EXTERNAL	OPTIONAL}
+
+MAP-CloseInfo ::= SEQUENCE {
+	plmn-specificInfo	[0] EXTERNAL	OPTIONAL}
+
+MAP-RefuseInfo ::= SEQUENCE {
+	reason	Reason,
+	plmn-specificInfo	[0] EXTERNAL	OPTIONAL}
+
+ReasonMAP-UserAbortInfo ::= SEQUENCE {
+	map-UserAbortChoice	MAP-UserAbortChoice,
+	plmn-specific	[0] EXTERNAL	OPTIONAL}
+
+MAP-UserAbortChoice ::= CHOICE {
+	userSpecificReason	[0] NULL,
+	userResourceLimitation	[1] NULL,
+	resourceUnavailable	[2] ResourceUnavailableReason,
+	applicationProcedureCancellation	[3] ProcedureCancellationReason}
+
+ResourceUnavailableReason ::= ENUMERATED {
+	shortTermResourceLimitation  (0),
+	longTermResourceLimitation  (1)}
+
+ProcedureCancellationReason ::= ENUMERATED {
+	handoverCancellation  (0),
+	radioChannelRelease  (1),
+	networkPathRelease  (2),
+	callRelease  (3),
+	associatedProcedureFailure  (4),
+	tandemDialogueRelease (5),
+	remoteOperationsFailure  (6)}
+
+MAP-ProviderAbortInfo ::= SEQUENCE {
+	map-ProviderAbortReason	MAP-ProviderAbortReason,
+	plmn-specificInfo	EXTERNAL		OPTIONAL}
+
+MAP-ProviderAbortReason ::= ENUMERATED {
+	abnormalDialogue  (0),
+	invalidPDU  (1)}
+
+
+--- MODULE 'MAP-Protocol' START ---
+MAP-Protocol {
+   ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
+   moduleId (3) map-Protocol (4) version2 (2)}
+
+DEFINITIONS
+
+::=
+
+BEGIN
+
+IMPORTS
+--<B--	UpdateLocationArea,--B>--
+	UpdateLocation,
+	CancelLocation,
+	PurgeMS,
+	SendIdentification,
+--<B--	DetachIMSI,--B>--
+--<B--	AttachIMSI,
+--<B--	Page,--B>--
+--<B--	SearchForMS,--B>--
+--<B--	ProcessAccessRequest,--B>--
+	PerformHandover,
+	SendEndSignal,
+	ProcessAccessSignalling,
+	ForwardAccessSignalling,
+	PerformSubsequentHandover,
+	AllocateHandoverNumber,--B>--
+--<B--	SendHandoverReport,--B>--
+--<B--	Authenticate,--B>--
+	SendAuthenticationInfo,
+--<B--	SetCipheringMode,
+	CheckIMEI,
+--<B--	ObtainIMEI,--B>--
+	SendParameters,
+	InsertSubscriberData,
+	DeleteSubscriberData,
+--<B--	ProvideIMSI,--B>--
+--<B--	ForwardNewTMSI,--B>--
+	Reset,
+	ForwardCheckSS-Indication,
+	RestoreData
+FROM MAP-MobileServiceOperations {
+   ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
+   moduleId (3) map-MobileServiceOperations (5) version2 (2)}
+
+	ActivateTraceMode,
+	DeactivateTraceMode,
+	TraceSubscriberActivity,
+	NoteInternalHandover,
+	SendIMSI
+FROM MAP-OperationAndMaintenanceOperations {
+   ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
+   moduleId (3) map-OperationAndMaintenanceOperations (6) version2 (2)}
+
+	SendInfoForIncomingCall,--B>--
+--<B--	ConnectToFollowingAddress,--B>--
+--<B--	ProcessCallWaiting,--B>--
+--<B--	SendInfoForOutgoingCall,
+	SendRoutingInfo,
+	ProvideRoamingNumber--<B--,--B>--
+--<B--	CompleteCall--B>--
+FROM MAP-CallHandlingOperations {
+   ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
+   moduleId (3) map-CallHandlingOperaations (7) version2 (2)}
+
+	RegisterSS,
+	EraseSS,
+	ActivateSS,
+	DeactivateSS,
+	InterrogateSS,
+--<B--	InvokeSS,--B>--
+	ProcessUnstructuredSS-Data,
+	ProcessSS-Request,
+	SS-GetDigits,
+	SS-GetString,
+	UnstructuredNotifySS,
+	RegisterPassword,
+	GetPassword,
+	BeginSubscriberActivity
+FROM MAP-SupplementaryServiceOperations {
+   ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
+   moduleId (3) map-SupplementaryServiceOperations (8) version2 (2)}
+
+	SendRoutingInfoForSM,
+	ForwardSM,
+	ReportSM-DeliveryStatus,
+	NoteSubscriberPresent,
+	AlertServiceCentre,
+	InformServiceCentre,
+	SendInfoForMT-SMS,--B>--
+--<B--	SendInfoForMO-SMS,--B>--
+	ReadyForSM
+FROM MAP-ShortMessageServiceOperations {
+   ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
+   moduleId (3) map-ShortMessageServieOperations (9) version2 (2)}
+
+	SystemFailure,
+	DataMissing,
+	UnexpectedDataValue,
+	FacilityNotSupported,
+	UnknownSubscriber,
+	NumberChanged,
+	UnknownBaseStation,
+	UnknownMSC,
+--<B--	UnknownLocArea,--B>--
+	UnidentifiedSubscriber,
+--<B--	UnallocatedRoamingNumber,
+	UnknownEquipment,
+	RoamingNotAllowed,
+	IllegalSubscriber,
+	IllegalEquipment,
+	BearerServiceNotProvisioned,
+	TeleserviceNotProvisioned,
+	InvalidTargetBaseStation,
+	NoRadioResourceAvailable,
+	NoHandoverNumberAvailable,
+	SubsequentHandoverFailure,
+	TracingBufferFull,
+	NoRoamingNumberAvailable,
+	AbsentSubscriber,
+--<B--	BusySubscriber,--B>--
+--<B--	NoSubscriberReply,--B>--
+--<B--	RadioCongestion,--B>--
+	ImpossibleCallCompletion,--B>--
+	CallBarred,
+	ForwardingViolation,
+	CUG-Reject,
+	IllegalSS-Operation,
+	SS-ErrorStatus,
+	SS-NotAvailable,
+	SS-SubscriptionViolation,
+	SS-Incompatibility,
+	SS-PartialAcceptance,
+	SS-NotDelivered,
+	PW-RegistrationFailure,
+	NegativePW-Check,
+	NumberOfPW-AttemptsViolation,
+	SM-DeliveryFailure,
+	MessageWaitingListFull
+FROM MAP-Errors {
+   ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
+   moduleId (3) map-Errors (10) version2 (2)}
+;
+
+
+-- location registration operation codes
+
+updateLocation  UpdateLocation ::= localValue 2
+cancelLocation  CancelLocation ::= localValue 3
+purgeMS  PurgeMS ::= localValue 67
+-- NU1 purgeMS must not be used in version 1
+sendIdentification  SendIdentification::= localValue 55
+-- NU1 sendIdentification must not be used in version 1
+
+
+-- handover operation codes
+
+  PerformHandover ::= localValue 28
+sendEndSignal  SendEndSignal ::= localValue 29
+processAccessSignalling  ProcessAccessSignalling ::= localValue 33
+forwardAccessSignalling  ForwardAccessSignalling ::= localValue 34
+performSubsequentHandover  PerformSubsequentHandover ::= localValue 30
+
+
+-- authentication operation codes
+
+sendAuthenticationInfo  SendAuthenticationInfo ::= localValue 56
+-- NU1 sendAuthenticationInfo must not be used in version 1
+
+
+-- IMEI management operation codes
+
+checkIMEI  CheckIMEI ::= localValue 43
+
+
+-- subscriber management operation codes
+
+sendParameters-- NU>1 sendParameters must not be used in version greater 1
+insertSubscriberData  InsertSubscriberData ::= localValue 7
+deleteSubscriberData  DeleteSubscriberData ::= localValue 8
+
+
+-- fault recovery operation codes
+
+reset  Reset ::= localValue 37
+forwardCheckSS-Indication  ForwardCheckSS-Indication ::= localValue 38
+restoreData  RestoreData ::= localValue 57
+-- NU1 activateTraceMode  ActivateTraceMode ::= localValue 50
+deactivateTraceMode  DeactivateTraceMode ::= localValue 51
+traceSubscriberActivity  TraceSubscriberActivity ::= localValue 52
+noteInternalHandover  NoteInternalHandover ::= localValue 35
+sendIMSI  SendIMSI ::= localValue 58
+-- NU1 sendIMSI must not be used in version 1
+
+
+-- call handling operation codes
+
+sendRoutingInfo  SendRoutingInfo ::= localValue 22
+provideRoamingNumber  ProvideRoamingNumber ::= localValue 4
+
+
+-- supplementary service handling operation codes
+
+  RegisterSS ::= localValue 10
+eraseSS  EraseSS ::= localValue 11
+activateSS  ActivateSS ::= localValue 12
+deactivateSS  DeactivateSS ::= localValue 13
+interrogateSS  InterrogateSS ::= localValue 14
+processUnstructuredSS-Data  ProcessUnstructuredSS-Data ::= localValue 19
+-- NU>1 processUnstructuredSS-Data must not be used in version greater 1
+processSS-Request  ProcessSS-Request ::= localValue 59
+-- processSS-Request must not be used in version 1
+ss-GetDigits  SS-GetDigits ::= localValue 60
+-- NU1 ss-GetDigits must not be used in version 1
+ss-GetString  SS-GetString ::= localValue 61
+-- NU1 ss-GetString must not be used in version 1
+unstructuredNotifySS  UnstructuredNotifySS ::= localValue 62
+-- NU1 unstructuredNotifySS must not be used in version 1
+registerPassword  RegisterPassword ::= localValue 17
+  GetPassword ::= localValue 18
+beginSubscriberActivity  BeginSubscriberActivity ::= localValue 54
+-- NU>1 beginSubscriberActivity must not be used in version greater 1
+
+
+-- short message service operation codes
+
+sendRoutingInfoForSM  SendRoutingInfoForSM ::= localValue 45
+forwardSM  ForwardSM ::= localValue 46
+reportSM-DeliveryStatus  ReportSM-DeliveryStatus ::= localValue 47
+noteSubscriberPresent  NoteSubscriberPresent ::= localValue 48
+-- NU>1 noteSubscriberPresent must not be used in version greater 1
+  AlertServiceCentre ::= localValue 49
+informServiceCentre  InformServiceCentre ::= localValue 63
+-- NU1 informServiceCentre must not be used in version 1
+readyForSM  ReadyForSM ::= localValue 66
+-- NU1 readyForSM must not be used in version 1
+
+
+-- generic error codes
+
+systemFailure  SystemFailure ::= localValue 34
+dataMissing  DataMissing ::= localValue 35
+unexpectedDataValue  UnexpectedDataValue ::= localValue 36
+  FacilityNotSupported ::= localValue 21
+
+
+-- identification and numbering error codes
+
+unknownSubscriber  UnknownSubscriber ::= localValue 1
+numberChanged  NumberChanged ::= localValue 44
+unknownBaseStation  UnknownBaseStation ::= localValue 2
+unknownMSC  UnknownMSC ::= localValue 3
+unidentifiedSubscriber  UnidentifiedSubscriber ::= localValue 5
+unknownEquipment  UnknownEquipment ::= localValue 7
+
+
+-- subscription error codes
+
+roamingNotAllowed  RoamingNotAllowed ::= localValue 8
+illegalSubscriberillegalEquipment  IllegalEquipment ::= localValue 12
+bearerServiceNotProvisioned  BearerServiceNotProvisioned ::= localValue 10
+teleserviceNotProvisioned  TeleserviceNotProvisioned ::= localValue 11
+
+
+-- handover error codes
+
+invalidTargetBaseStation  InvalidTargetBaseStation ::= localValue 23
+noRadioResourceAvailable  NoRadioResourceAvailable ::= localValue 24
+noHandoverNumberAvailable  NoHandoverNumberAvailable ::= localValue 25
+subsequentHandoverFailure  SubsequentHandoverFailure ::= localValue 26
+
+
+-- operation and maintenance error codes
+
+tracingBufferFull  TracingBufferFull ::= localValue 40
+
+
+-- call handling error codes
+
+  NoRoamingNumberAvailable ::= localValue 39
+absentSubscriber  AbsentSubscriber ::= localValue 27
+callBarred  CallBarred ::= localValue 13
+forwardingViolation  ForwardingViolation ::= localValue 14
+cug-Reject  CUG-Reject ::= localValue 15
+
+
+-- supplementary service error codes
+
+illegalSS-Operation  IllegalSS-Operation ::= localValue 16
+ss-ErrorStatus  SS-ErrorStatus ::= localValue 17
+ss-NotAvailable  SS-NotAvailable ::= localValue 18
+ss-SubscriptionViolationss-Incompatibility  SS-Incompatibility ::= localValue 20
+ss-PartialAcceptance  SS-PartialAcceptance ::= localValue 41
+-- NU1 ss-PartialAcceptance must not be used in version 1
+ss-NotDelivered  SS-NotDelivered ::= localValue 42
+-- NU1 ss-NotDelivered must not be used in version 1
+pw-RegistrationFailurenegativePW-Check  NegativePW-Check ::= localValue 38
+numberOfPW-AttemptsViolation  NumberOfPW-AttemptsViolation ::= localValue 43
+-- NU1 numberOfPW-AttemptsViolation must not be used in version 1
+
+
+-- short message service error codes
+
+sm-DeliveryFailure  SM-DeliveryFailure ::= localValue 32
+messageWaitingListFull  MessageWaitingListFull ::= localValue 33
+
+
+--- MODULE 'MAP-MobileServiceOperations' START ---
+MAP-MobileServiceOperations--<B--	UpdateLocationArea,--B>--
+	UpdateLocation,
+	CancelLocation,
+	PurgeMS,
+	SendIdentification,
+--<B--	DetachIMSI,--B>--
+--<B--	AttachIMSI,--B>--
+
+	-- paging management operations
+--<B----B>--
+--<B--	SearchForMS,--B>--
+
+	-- access management operations
+--<B--	ProcessAccessRequest,--B>--
+
+	-- handover operations
+	PerformHandover,
+	SendEndSignal,
+	ProcessAccessSignalling,
+	ForwardAccessSignalling,
+	PerformSubsequentHandover,
+--<B--	AllocateHandoverNumber,--B>----<B--	SendHandoverReport,--B>--
+
+	-- authentication management operations
+--<B--	Authenticate,--B>--
+	SendAuthenticationInfo,
+
+	-- security management operations
+--<B--	SetCipheringMode,--B>--
+
+	-- IMEI management operations
+	CheckIMEI,
+--<B----B>--
+
+	-- subscriber management operations
+	SendParameters,
+	InsertSubscriberData,
+	DeleteSubscriberData,
+
+	-- identity management operations
+--<B--	ProvideIMSI,--B>--
+--<B--	ForwardNewTMSI,--B>--
+
+	-- fault recovery operations
+	Reset,
+	ForwardCheckSS-Indication,
+	RestoreData
+;
+
+IMPORTS
+	OPERATION
+FROM TCAPMessages {ccitt recommendation q 773 modules(2) messages (1)}
+
+	SystemFailure,
+	DataMissing,
+	UnexpectedDataValue,
+	UnknownSubscriber,
+	UnknownBaseStation,
+	UnknownMSC,
+--<B--	UnknownLocArea,--B>----<B--	IllegalSubscriber,--B>--
+--<B--	IllegalEquipment,--B>--
+	InvalidTargetBaseStation,
+	NoRadioResourceAvailable,
+	NoHandoverNumberAvailable,
+	SubsequentHandoverFailure--<B--,--B>--
+--<B----B>--
+--<B--	BusySubscriber--B>--
+FROM MAP-Errors {
+   ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
+   moduleId (3) map-Errors (10) version2 (2)}
+
+--<B--	UpdateLocationAreaArg,--B>--
+	UpdateLocationArg,
+	UpdateLocationRes,
+	CancelLocationArg,
+	PurgeMS-Arg,
+	SendIdentificationRes,
+--<B--	PageArg,--B>----<B--	SearchForMS-Arg,--B>--
+--<B--	ProcessAccessRequestArg,--B>--
+--<B--	ProcessAccessRequestRes,--B>--
+	PerformHO-Arg,
+	PerformHO-Res,
+	PerformSubsequentHO-Arg,
+--<B----B>--
+	SendAuthenticationInfoArg,
+	SendAuthenticationInfoRes,
+--<B--	SRES,--B>--
+--<B--	SetCipheringModeArg,--B>--
+	CheckIMEI-Arg,
+	SendParametersArg,
+	SentParameterList,
+	InsertSubscriberDataArg,
+	InsertSubscriberDataRes,
+	DeleteSubscriberDataArg,
+	ResetArg,
+	RestoreDataArg,
+	RestoreDataRes
+FROM MAP-MS-DataTypes {
+   ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
+   moduleId (3) map-MS-DataTypes (11) version2 (2)}
+
+--<B--	ISDN-AddressString,--B>----<B--	IMSI,--B>--
+	TMSI,
+--<B--	SubscriberId,--B>--
+	IMEI--<B--,--B>--
+--<B----B>--
+FROM MAP-CommonDataTypes {
+   ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
+   moduleId (3) map-CommonDataTypes (18) version2 (2)}
+;
+
+
+-- location registration operations
+
+--<B--UpdateLocationArea ::= OPERATION				--Timer m----B>--
+--<B--	ARGUMENT--B>--
+--<B--		updateLocationAreaArg	UpdateLocationAreaArg
+--<B--	RESULT zzzz-Empty	NULL--B>--
+--<B--	ERRORS {--B>--
+--<B--		SystemFailure,--B>--
+		DataMissing,--B>--
+--<B--		-- NU1 DataMissing must not be used in version 1----B>--
+--<B--		UnexpectedDataValue,--B>--
+		UnknownSubscriber,--B>--
+--<B--		UnknownLocArea,--B>--
+--<B--		RoamingNotAllowed,--B>--
+--<B--		IllegalSubscriber,
+--<B--		IllegalEquipment}--B>--
+--<B--		-- NU1 IllegalEquipment must not be used in version 1----B>--
+
+UpdateLocation ::= OPERATION				--Timer m--NU1 DataMissing must not be used in version 1
+		UnexpectedDataValue,
+		UnknownSubscriber,
+		RoamingNotAllowed}
+
+CancelLocation ::= OPERATION				--Timer m--
+	ARGUMENT
+		cancelLocationArg	CancelLocationArg
+	RESULT zzzz-Empty	NULL
+	ERRORS {
+		DataMissing,
+		-- NU1 DataMissing must not be used in version 1
+		UnexpectedDataValue,
+		UnidentifiedSubscriber}
+		-- NU>1 UnidentifiedSubscriber must not be used in version 1
+
+PurgeMS--
+	ARGUMENT
+		purgeMS-Arg	PurgeMS-Arg
+	RESULT zzzz-Empty	NULL
+
+SendIdentification::= OPERATION				--Timer s--
+	ARGUMENT
+		tmsi		TMSI
+	RESULT
+		sendIdentificationRes	SendIdentificationRes
+	ERRORS {
+		DataMissing,
+		UnidentifiedSubscriber}
+
+--<B--DetachIMSI ::= OPERATION				--Timer s----B>--
+	ARGUMENT--B>--
+--<B--		subscriberId		SubscriberId--B>--
+
+--<B--AttachIMSI ::= OPERATION				--Timer s----B>--
+--<B----B>--
+--<B--		subscriberId		SubscriberId--B>--
+--<B--	RESULT zzzz-Empty	NULL--B>--
+--<B--	ERRORS {--B>----<B--		SystemFailure,--B>--
+--<B--		DataMissing,--B>--
+--<B--		-- NU1 DataMissing must not be used in version 1----B>----<B--		UnexpectedDataValue,--B>--
+--<B--		UnknownSubscriber,--B>--
+--<B--		UnidentifiedSubscriber,--B>--
+--<B----B>--
+--<B--		IllegalSubscriber}--B>--
+
+
+-- paging management operations
+
+--<B--Page ::= OPERATION				--Timer m----B>--
+--<B--	ARGUMENT
+--<B--		pageArg	PageArg--B>--
+--<B--	ERRORS {--B>--
+--<B--		SystemFailure,--B>--
+		DataMissing,--B>--
+--<B--		-- NU1 DataMissing must not be used in version 1----B>--
+--<B--		UnexpectedDataValue,--B>--
+		UnknownLocArea,--B>--
+--<B--		AbsentSubscriber,--B>--
+--<B--		BusySubscriber}--B>--
+
+--<B--SearchForMS----B>--
+--<B--	ARGUMENT--B>--
+--<B--		searchForMS-Arg	SearchForMS-Arg--B>--
+--<B--	RESULT--B>----<B--		currentLocAreaId	LocAreaId--B>--
+--<B--	ERRORS {--B>--
+--<B--		SystemFailure,--B>--
+--<B----B>--
+--<B--		-- NU1 DataMissing must not be used in version 1----B>--
+--<B--		UnexpectedDataValue,--B>--
+--<B----B>--
+--<B--		BusySubscriber}--B>--
+
+
+-- access management operations
+
+--<B--ProcessAccessRequest ::= OPERATION				--Timer m----B>--
+--<B--	ARGUMENT
+--<B--		proccessAccessRequestArg	ProcessAccessRequestArg--B>--
+--<B--	RESULT--B>--
+--<B--		processAccessRequestRes	ProcessAccessRequestRes--B>--
+	ERRORS {--B>--
+--<B--		SystemFailure,--B>--
+--<B--		DataMissing,--B>--
+--<B--		-- DataMissing must not be used in version 1----B>--
+--<B--		UnexpectedDataValue,--B>--
+--<B--		UnknownSubscriber,--B>--
+--<B--		-- UnknownSubscriber must not be used in version greater 1----B>--
+--<B--		UnknownLocArea,--B>--
+--<B--		-- NU1 UnknownLocArea must not be used in version 1----B>--
+		UnidentifiedSubscriber,--B>--
+--<B--		RoamingNotAllowed,--B>--
+--<B--		-- NU1 RoamingNotAllowed must not be used in version 1----B>--
+		IllegalSubscriber,--B>--
+--<B--		IllegalEquipment}--B>--
+--<B--		-- NU1 IllegalEquipment must not be used in version 1----B>--
+
+
+-- handover operations
+
+PerformHandover--
+	ARGUMENT
+		performHO-Arg	PerformHO-Arg
+	RESULT
+		performHO-Res	PerformHO-Res
+	ERRORS {
+		SystemFailure,
+		DataMissing,
+		-- NU1 DataMissing must not be used in version 1
+		UnexpectedDataValue,
+		UnknownBaseStation,
+		InvalidTargetBaseStation,
+		NoRadioResourceAvailable,
+		NoHandoverNumberAvailable}
+
+SendEndSignal ::= OPERATION				--Timer l--
+	RESULT zzzz-Empty	NULL
+
+ProcessAccessSignalling ::= OPERATION			--Timer s--
+	ARGUMENT
+		bss-APDU	ExternalSignalInfo
+
+ ::= OPERATION			--Timer s--
+	ARGUMENT
+		bss-APDU	ExternalSignalInfo
+
+PerformSubsequentHandover ::= OPERATION			--Timer m--
+	ARGUMENT
+		performSubsequentHO-Arg	PerformSubsequentHO-Arg
+	RESULT
+		accessSignalInfo	ExternalSignalInfo
+	ERRORS {
+		UnexpectedDataValue,
+		DataMissing,
+		-- NU1 DataMissing must not be used in version 1
+		UnknownBaseStation,
+		UnknownMSC,
+		InvalidTargetBaseStation,
+		SubsequentHandoverFailure}
+
+--<B--AllocateHandoverNumber ::= OPERATION			--Timer s----B>----<B--	ERRORS {--B>--
+--<B--		NoHandoverNumberAvailable}--B>--
+--<B--	LINKED {--B>--
+--<B----B>--
+
+--<B--SendHandoverReport ::= OPERATION				--Timer l----B>--
+--<B--	ARGUMENT--B>--
+--<B--		handoverNumber	ISDN-AddressString
+--<B--	RESULT zzzz-Empty	NULL--B>--
+
+
+-- authentication management operations
+
+--<B--Authenticate ::= OPERATION				--Timer s----B>--
+--<B--	ARGUMENT--B>----<B--		authenticateArg	AuthenticateArg--B>--
+--<B--	RESULT--B>--
+--<B--		sres		SRES--B>--
+
+SendAuthenticationInfo--
+	ARGUMENT
+		sendAuthenticationInfoArg	SendAuthenticationInfoArg
+	RESULT
+		sendAuthenticationInfoRes	SendAuthenticationInfoRes
+	ERRORS {
+		SystemFailure,
+		DataMissing,
+		UnexpectedDataValue,
+		UnknownSubscriber}
+
+
+-- security management operations
+
+--<B--SetCipheringMode ::= OPERATION				--Timer s----B>--
+--<B--	ARGUMENT--B>--
+--<B--		setCipheringModeArg	SetCipheringModeArg
+
+
+-- IMEI management operations
+
+CheckIMEI ::= OPERATION					--Timer m--
+	ARGUMENT
+		imei		IMEI
+		-- optional:
+		-- OP1 imei must be present in version 1
+	RESULT
+		checkIMEI-Arg	CheckIMEI-Arg
+	ERRORS {
+		SystemFailure,
+		DataMissing,
+		-- NU1 DataMissing must not be used in version 1
+		UnexpectedDataValue,
+		-- NU>1 UnexpectedDataValue must not be used in version greater 1
+		UnknownEquipment}
+
+--<B--ObtainIMEI----B>--
+--<B--	RESULT--B>--
+--<B--		imei	IMEI--B>--
+--<B--	ERRORS {--B>----<B--		SystemFailure}--B>--
+
+
+-- subscriber management operations
+
+SendParameters ::= OPERATION				--Timer m--
+	ARGUMENT
+		sendParametersArg	SendParametersArg
+	RESULT
+		sentParameterList	SentParameterList
+		-- optional
+		-- nothing is returned, if no requested parameter is available or
+		-- exists
+	ERRORS {
+		UnexpectedDataValue,
+		UnknownSubscriber,
+		UnidentifiedSubscriber}
+
+InsertSubscriberData ::= OPERATION				--Timer m--
+	ARGUMENT
+		insertSubscriberDataArg	InsertSubscriberDataArg
+	RESULT
+		insertSubscriberDataRes	InsertSubscriberDataRes
+		-- optional
+		-- OA1 insertSubscriberDataRes must be absent in version 1
+	ERRORS {
+		DataMissing,
+		UnexpectedDataValue,
+		UnidentifiedSubscriber}
+
+ ::= OPERATION				--Timer m--
+	ARGUMENT
+		deleteSubscriberDataArg	DeleteSubscriberDataArg
+	RESULT zzzz-Empty	NULL
+	ERRORS {
+		DataMissing,
+		UnexpectedDataValue,
+		UnidentifiedSubscriber}
+
+
+-- identity management operations
+
+--<B--ProvideIMSI ::= OPERATION				--Timer s----B>--
+--<B--	RESULT--B>----<B--		imsi		IMSI--B>--
+--<B--	ERRORS {--B>--
+--<B--		DataMissing,--B>--
+--<B--NU1 DataMissing must not be used in version 1----B>--
+--<B--		AbsentSubscriber}--B>--
+
+--<B--ForwardNewTMSI ::= OPERATION				--Timer s----B>--
+	ARGUMENT--B>--
+--<B--		tmsi		TMSI--B>--
+--<B--	RESULT zzzz-Empty	NULL--B>--
+
+
+-- fault recovery operations
+
+Reset ::= OPERATION					--Timer m--ForwardCheckSS-Indication ::= OPERATION			--Timer s--
+
+RestoreData ::= OPERATION				--Timer m--
+	ARGUMENT
+		restoreDataArg	RestoreDataArg
+	RESULT
+		restoreDataRes	RestoreDataRes
+	ERRORS {
+		SystemFailure,
+		DataMissing,
+		UnexpectedDataValue,
+		UnknownSubscriber}
+
+
+--- MODULE 'MAP-OperationAndMaintenanceOperations' START ---
+MAP-OperationAndMaintenanceOperations {
+   ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
+   moduleId (3) map-OperationAndMaintenanceOperations (6) version2 (2)}
+
+DEFINITIONS
+
+::=
+
+BEGIN
+
+EXPORTS
+	ActivateTraceMode,
+	DeactivateTraceMode,
+	TraceSubscriberActivity,
+	NoteInternalHandover,
+	SendIMSI
+;
+
+IMPORTS
+	OPERATION
+FROM TCAPMessages {ccitt recommendation q 773 modules(2) messages (1)}
+
+	SystemFailure,
+	DataMissing,
+	UnexpectedDataValue,
+	FacilityNotSupported,
+	UnknownSubscriber,
+	UnidentifiedSubscriber,
+	TracingBufferFull
+FROM MAP-Errors {
+   ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
+   moduleId (3) map-Errors (10) version2 (2)}
+
+	ActivateTraceModeArg,
+	DeactivateTraceModeArg,
+	TraceSubscriberActivityArg,
+	NoteInternalHO-Arg
+FROM MAP-OM-DataTypes {
+   ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
+   moduleId (3) map-OM-DataTypes (12) version2 (2)}
+
+	ISDN-AddressString,
+	IMSI
+FROM MAP-CommonDataTypes {
+   ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
+   moduleId (3) map-ComonDataTypes (18) version2 (2)}
+;
+
+
+ActivateTraceMode--
+	ARGUMENT
+		activateTraceModeArg	ActivateTraceModeArg
+	RESULT zzzz-Empty	NULL
+	ERRORS {
+		SystemFailure,
+		DataMissing,
+		UnexpectedDataValue,
+		FacilityNotSupported,
+		UnidentifiedSubscriber,
+		TracingBufferFull}
+
+DeactivateTraceMode ::= OPERATION				--Timer m--
+	ARGUMENT
+		deactivateTraceModeArg	DeactivateTraceModeArg
+	RESULT zzzz-Empty	NULL
+	ERRORS {
+		SystemFailure,
+		DataMissing,
+		UnexpectedDataValue,
+		FacilityNotSupported,
+		UnidentifiedSubscriber}
+
+TraceSubscriberActivity ::= OPERATION			--Timer s--
+	ARGUMENT
+		traceSubscriberActivityArg	TraceSubscriberActivityArg
+
+ ::= OPERATION				--Timer s--
+	ARGUMENT
+		noteInternalHO-Arg	NoteInternalHO-Arg
+
+SendIMSI ::= OPERATION					--Timer m--
+	ARGUMENT
+		msisdn			ISDN-AddressString
+	RESULT
+		imsi			IMSI
+	ERRORS {
+		DataMissing,
+		UnexpectedDataValue,
+		UnknownSubscriber}
+
+
+--- MODULE 'MAP-CallHandlingOperations' START ---
+MAP-CallHandlingOperations {
+   ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
+   moduleId (3) map-CallHandlingOperations (7) version2 (2)}
+
+DEFINITIONS
+
+::=
+
+BEGIN
+
+EXPORTS
+--<B----B>--
+--<B--	ConnectToFollowingAddress,--B>--
+--<B--	ProcessCallWaiting,--B>--
+--<B--	SendInfoForOutgoingCall,--B>----<B--,--B>--
+--<B--	CompleteCall--B>--
+;
+
+IMPORTS
+	OPERATION
+FROM TCAPMessages {ccitt recommendation q 773 modules(2) messages (1)}
+
+	SystemFailure,
+	DataMissing,
+	UnexpectedDataValue,
+	FacilityNotSupported,
+	UnknownSubscriber,
+	NumberChanged,
+--<B--	UnidentifiedSubscriber,--B>--
+--<B----B>--
+	BearerServiceNotProvisioned,
+	TeleserviceNotProvisioned,
+	NoRoamingNumberAvailable,
+	AbsentSubscriber,
+--<B--	BusySubscriber,--B>--
+--<B--	NoSubscriberReply,--B>--
+--<B--	RadioCongestion,--B>----<B--	ImpossibleCallCompletion,--B>--
+	CallBarred,
+	ForwardingViolation,
+	CUG-Reject
+FROM MAP-Errors {
+   ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
+   moduleId (3) map-Errors (10) version2 (2)}
+
+--<B--	InfoForIC-Arg,--B>--
+--<B--	ConnectToFollowingAddressArg,--B>--
+--<B----B>--
+--<B--	InfoForOC-Arg,--B>--
+	SendRoutingInfoArg,
+	SendRoutingInfoRes,
+	ProvideRoamingNumberArg--<B--,--B>--
+--<B--	CompleteCallArg--B>----<B--SendInfoForIncomingCall ::= OPERATION			--Timer m----B>--
+--<B--	ARGUMENT--B>--
+--<B--		infoForIC-Arg	InfoForIC-Arg--B>--
+	ERRORS {--B>--
+--<B--		SystemFailure,--B>--
+--<B--		DataMissing,--B>--
+--<B--		UnexpectedDataValue,
+--<B--		UnknownSubscriber,--B>--
+--<B--		UnidentifiedSubscriber,--B>--
+--<B--		UnallocatedRoamingNumber,--B>--
+		AbsentSubscriber,--B>--
+--<B--		ForwardingViolation,--B>--
+--<B--		ImpossibleCallCompletion}--B>--
+--<B--	LINKED {
+--<B--		CompleteCall,--B>--
+--<B--		ProcessCallWaiting,--B>--
+--<B--		ConnectToFollowingAddress}--B>--
+
+ConnectToFollowingAddress ::= OPERATION			--Timer s----B>--
+--<B--	ARGUMENT--B>--
+--<B--		connectToFollowingAddressArg	ConnectToFollowingAddressArg--B>--
+
+--<B-- ::= OPERATION				--Timer s----B>--
+--<B--	ARGUMENT--B>--
+--<B--		processCallWaitingArg	ProcessCallWaitingArg--B>--
+--<B--		-- optional
+--<B--		-- OA1 processCallWaitingArg must be absent in version 1----B>--
+--<B--	ERRORS {--B>--
+--<B--		DataMissing,
+--<B--		-- NU1 DataMissing must not be used in version 1----B>--
+--<B--		UnexpectedDataValue,--B>--
+--<B--		-- UnexpectedDataValue must not be used in version 1----B>--
+--<B--		BusySubscriber,--B>--
+--<B--		-- NU1 BusySubscriber must not be used in version 1----B>--
+		NoSubscriberReply}--B>--
+--<B--		-- NU1 NoSubscriberReply must not be used in version 1----B>--
+
+--<B--SendInfoForOutgoingCall ::= OPERATION			--Timer ml----B>----<B--	ARGUMENT--B>--
+--<B--		infoForOC-Arg	InfoForOC-Arg--B>--
+--<B--	ERRORS {--B>--
+--<B----B>--
+--<B--		DataMissing,--B>--
+--<B--		UnexpectedDataValue,--B>--
+--<B--		UnknownSubscriber,--B>----<B--		BearerServiceNotProvisioned,--B>--
+--<B--		TeleserviceNotProvisioned,--B>--
+--<B--		CallBarred,--B>--
+--<B----B>--
+--<B--	LINKED {--B>--
+--<B--		CompleteCall}--B>--
+
+SendRoutingInfo ::= OPERATION				--Timer m--NU1 NumberChanged must not be used in version 1
+	BearerServiceNotProvisioned,
+		TeleserviceNotProvisioned,
+		AbsentSubscriber,
+		CallBarred,
+		CUG-Reject,
+		ForwardingViolation}
+
+ProvideRoamingNumber ::= OPERATION				--Timer m--
+	ARGUMENT
+		provideRoamingNumberArg	ProvideRoamingNumberArg
+	RESULT
+		roamingNumber	ISDN-AddressString
+	ERRORS {
+		SystemFailure,
+		DataMissing,
+		UnexpectedDataValue,
+		FacilityNotSupported,
+		AbsentSubscriber,
+		NoRoamingNumberAvailable}
+
+--<B--CompleteCall ::= OPERATION				--Timer ml----B>--
+--<B--	ARGUMENT
+--<B--		completeCallArg	CompleteCallArg--B>--
+--<B--	ERRORS {--B>--
+--<B--		DataMissing,--B>--
+		UnexpectedDataValue,--B>--
+--<B--		BusySubscriber,--B>--
+--<B--		NoSubscriberReply,--B>--
+--<B--		RadioCongestion}
+
+
+--- MODULE 'MAP-SupplementaryServiceOperations' START ---
+MAP-SupplementaryServiceOperations {
+   ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
+   moduleId (3) map-SupplementaryServiceOperations (8) version2 (2)}
+
+DEFINITIONS
+
+::=
+
+BEGIN
+
+EXPORTS
+	RegisterSS,
+	EraseSS,
+	ActivateSS,
+	DeactivateSS,
+	InterrogateSS,
+--<B--	InvokeSS,--B>--
+	ProcessUnstructuredSS-Data,
+	ProcessSS-Request,
+	SS-GetDigits,
+	SS-GetString,
+	UnstructuredNotifySS,
+	RegisterPassword,
+	GetPassword,
+	BeginSubscriberActivity
+;
+
+IMPORTS
+	OPERATION
+FROM TCAPMessages {ccitt recommendation q 773 modules(2) messages (1)}
+
+	SystemFailure,
+	DataMissing,
+	UnexpectedDataValue,
+	UnknownSubscriber,
+	UnidentifiedSubscriber,
+	BearerServiceNotProvisioned,
+	TeleserviceNotProvisioned,
+	AbsentSubscriber,
+	CallBarred,
+	IllegalSS-Operation,
+	SS-ErrorStatus,
+	SS-NotAvailable,
+	SS-SubscriptionViolation,
+	SS-Incompatibility,
+	SS-PartialAcceptance,
+	SS-NotDelivered,
+	PW-RegistrationFailure,
+	NegativePW-Check,
+	NumberOfPW-AttemptsViolation
+FROM MAP-Errors {
+   ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
+   moduleId (3) map-Errors (10) version2 (2)}
+
+	RegisterSS-Arg,
+	SS-Info,
+	SS-ForBS-Code,
+	InterrogateSS-Res,
+	SS-UserData,
+	ProcessSS-RequestArg,
+	SS-DigitString,
+	ToneOrDisplay,
+	SS-GetDigitsArg,
+	SS-GetStringArg,
+	SS-GetStringRes,
+	Password,
+	GuidanceInfo,
+	BeginSubscriberActivityArg
+FROM MAP-SS-DataTypes {
+   ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
+   moduleId (3) map-SS-DataTypes (14) version2 (2)}
+
+	SS-Code
+FROM MAP-SS-Code {
+   ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
+   moduleId (3) map-SS-Code (15) version2 (2)}
+;
+
+
+-- supplementary service handling operations
+
+RegisterSS ::= OPERATION				--Timer m--NU>1 UnknownSubscriber must not be used in version greater 1
+		BearerServiceNotProvisioned,
+		TeleserviceNotProvisioned,
+		CallBarred,
+		-- NU1 CallBarred must not be used in version 1
+		IllegalSS-Operation,
+		SS-ErrorStatus,
+		SS-NotAvailable,
+		SS-SubscriptionViolation,
+		SS-Incompatibility,
+		SS-PartialAcceptance}
+		-- NU1 SS-PartialAcceptance must not be used in version 1
+
+EraseSS ::= OPERATION					--Timer m--
+	ARGUMENT
+		ss-ForBS	SS-ForBS-Code
+	RESULT
+		ss-Info	SS-Info
+		-- optional
+	ERRORS {
+		SystemFailure,
+		DataMissing,
+		-- NU1 DataMissing must not be used in version 1
+		UnexpectedDataValue,
+		UnknownSubscriber,
+		-- NU>1 NU1 CallBarred must not be used in version 1
+		IllegalSS-Operation,
+		SS-ErrorStatus,
+		SS-SubscriptionViolation}
+
+ActivateSS ::= OPERATION				--Timer m--
+	ARGUMENT
+		ss-ForBS	SS-ForBS-Code
+	RESULT
+		ss-Info	SS-Info
+		-- optional
+	ERRORS {
+		SystemFailure,
+		DataMissing,
+		-- NU1 DataMissing must not be used in version 1
+		UnexpectedDataValue,
+		UnknownSubscriber,
+		-- NU>1 UnknownSubscriber must not be used in version greater 1
+		BearerServiceNotProvisioned,
+		-- NU1 BearerServiceNotProvisioned must not be used in version 1
+		TeleserviceNotProvisioned,
+		-- NU1 NU1 CallBarred must not be used in version 1
+		IllegalSS-Operation,
+		SS-ErrorStatus,
+		SS-NotAvailable,
+		SS-SubscriptionViolation,
+		SS-Incompatibility,
+		SS-PartialAcceptance,
+		-- NU1 SS-PartialAcceptance must not be used in version 1
+		NegativePW-Check,
+		NumberOfPW-AttemptsViolation}
+
+DeactivateSS ::= OPERATION				--Timer m--
+	ARGUMENT
+		ss-ForBS	SS-ForBS-Code
+	RESULT
+		ss-Info	SS-Info
+		-- optional
+	ERRORS {
+		SystemFailure,
+		DataMissing,
+		-- NU1 DataMissing must not be used in version 1
+		UnexpectedDataValue,
+		UnknownSubscriber,
+		-- NU>1 UnknownSubscriber must not be used in version greater 1
+		CallBarred,
+		-- NU1 NU1 NumberOfPW-AttemptsViolation must not be used in version 1
+
+InterrogateSS ::= OPERATION				--Timer m--
+	ARGUMENT
+		ss-ForBS	SS-ForBS-Code
+	RESULT
+		interrogateSS-Res	InterrogateSS-Res
+	ERRORS {
+		SystemFailure,
+		DataMissing,
+		-- NU1 DataMissing must not be used in version 1
+		UnexpectedDataValue,
+		UnknownSubscriber,
+		-- NU>1 UnknownSubscriber must not be used in version greater 1
+		BearerServiceNotProvisioned,
+		-- NU1 BearerServiceNotProvisioned must not be used in version 1
+		TeleserviceNotProvisioned,
+		-- NU1 NU>1 SS-NotAvailable must not be used in version greater 1
+
+--<B--InvokeSS ::= OPERATION					--Timer m----B>--
+--<B--	ARGUMENT--B>--
+--<B--		ss-ForBS	SS-ForBS-Code
+--<B--	RESULT zzzz-Empty	NULL--B>--
+--<B--	ERRORS {--B>--
+--<B--		SystemFailure,--B>--
+		DataMissing,--B>--
+--<B--		UnexpectedDataValue,--B>--
+--<B--		CallBarred,--B>--
+--<B--		-- CallBarred must not be used in version 1----B>--
+--<B--		IllegalSS-Operation,--B>--
+--<B--		SS-ErrorStatus,--B>--
+--<B--		SS-NotAvailable}
+
+ProcessUnstructuredSS-Data ::= OPERATION		--Timer m--
+	ARGUMENT
+		ss-UserData	SS-UserData
+	RESULT
+		ss-UserData	SS-UserData
+		-- optional
+	ERRORS {
+		SystemFailure,
+		DataMissing,
+		-- NU1 DataMissing must not be used in version 1
+		UnexpectedDataValue}
+
+ProcessSS-Request ::= OPERATION				--Timer ml--
+	ARGUMENT
+		processSS-RequestArg	ProcessSS-RequestArg
+	RESULT
+		toneOrDisplay	ToneOrDisplay
+	ERRORS {
+		SystemFailure,
+		DataMissing,
+		UnexpectedDataValue,
+		UnknownSubscriber,
+		CallBarred}
+
+SS-GetDigits ::= OPERATION				--Timer ml--SS-GetString ::= OPERATION				--Timer ml--
+	ARGUMENT
+		ss-GetStringArg	SS-GetStringArg
+	RESULT
+		ss-GetStringRes	SS-GetStringRes
+
+UnstructuredNotifySS ::= OPERATION				--Timer ml--
+	ARGUMENT
+		toneOrDisplay	ToneOrDisplay
+	ERRORS {
+		SystemFailure,
+		DataMissing,
+		UnexpectedDataValue,
+		UnidentifiedSubscriber,
+		AbsentSubscriber,
+		SS-NotDelivered}
+
+RegisterPassword ::= OPERATION				--Timer m--
+	ARGUMENT
+		ss-Code	SS-Code
+	RESULT
+		newPassword	Password
+	ERRORS {
+		SystemFailure,
+		DataMissing,
+		-- NU1 DataMissing must not be used in version 1
+		UnexpectedDataValue,
+		CallBarred,
+		-- CallBarred must not be used in version 1
+		SS-SubscriptionViolation,
+		PW-RegistrationFailure,
+		NegativePW-Check,
+		NumberOfPW-AttemptsViolation}
+		-- NU1 NumberOfPW-AttemptsViolation must not be used in version 1
+	LINKED {
+		GetPassword}
+
+GetPassword ::= OPERATION				--Timer m--
+	ARGUMENT
+		guidanceInfo	GuidanceInfo
+	RESULT
+		currentPassword	Password
+
+BeginSubscriberActivity ::= OPERATION			--Timer m--
+	ARGUMENT
+		beginSubscriberActivityArg	BeginSubscriberActivityArg
+
+
+--- MODULE 'MAP-ShortMessageServiceOperations' START ---
+MAP-ShortMessageServiceOperations {
+   ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
+   moduleId (3) map-ShortMessageServiceOperations (9) version2 (2)}
+
+DEFINITIONS
+
+::=
+
+BEGIN
+
+EXPORTS
+	SendRoutingInfoForSM,
+	ForwardSM,
+	ReportSM-DeliveryStatus,
+	NoteSubscriberPresent,
+	AlertServiceCentre,
+	InformServiceCentre,
+--<B--	SendInfoForMT-SMS,--B>--
+--<B--	SendInfoForMO-SMS,--B>--
+	ReadyForSM
+;
+
+IMPORTS
+	OPERATION
+FROM TCAPMessages {ccitt recommendation q 773 modules(2) messages (1)}
+
+	SystemFailure,
+	DataMissing,
+	UnexpectedDataValue,
+	FacilityNotSupported,
+	UnknownSubscriber,
+	UnidentifiedSubscriber,
+	IllegalSubscriber,
+	IllegalEquipment,
+	TeleserviceNotProvisioned,
+	AbsentSubscriber,
+	CallBarred,
+	SM-DeliveryFailure,
+	MessageWaitingListFull
+FROM MAP-Errors {
+   ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
+   moduleId (3) map-Errors (10) version2 (2)}
+
+	RoutingInfoForSM-Arg,
+	RoutingInfoForSM-Res,
+	ForwardSM-Arg,
+--<B--	SM-RP-DA,--B>--
+	ReportSM-DeliveryStatusArg,
+	AlertServiceCentreArg,
+	InformServiceCentreArg,
+	ReadyForSM-Arg
+FROM MAP-SM-DataTypes {
+   ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
+   moduleId (3) map-SM-DataTypes (16) version2 (2)}
+
+	AddressString,--B>--
+	ISDN-AddressString,
+	IMSI
+FROM MAP-CommonDataTypes {
+   ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
+   moduleId (3) map-CommonDataTypes (18) version2 (2)}
+;
+
+
+SendRoutingInfoForSM ::= OPERATION				--Timer m--
+	ARGUMENT
+		routingInfoForSM-Arg	RoutingInfoForSM-Arg
+	RESULT
+		routingInfoForSM-Res	RoutingInfoForSM-Res
+	ERRORS {
+		SystemFailure,
+		DataMissing,
+		UnexpectedDataValue,
+		FacilityNotSupported,
+		UnknownSubscriber,
+		TeleserviceNotProvisioned,
+		AbsentSubscriber,
+		CallBarred}
+
+ForwardSM ::= OPERATION					--Timer m--
+	ARGUMENT
+		forwardSM-Arg	ForwardSM-Arg
+	RESULT zzzz-Empty	NULL
+	ERRORS {
+		SystemFailure,
+		DataMissing,
+		-- NU1 NU1 IllegalEquipment must not be used in version 1
+		AbsentSubscriber,
+		SM-DeliveryFailure}
+
+ReportSM-DeliveryStatus ::= OPERATION			--Timer s--
+	ARGUMENT
+		reportSM-DeliveryStatusArg	ReportSM-DeliveryStatusArg
+	RESULT
+		storedMSISDN	ISDN-AddressString
+		-- optional
+		-- OA1 storedMSISDN must be absent in version 1
+		-- OP>1 storedMSISDN must be present in version greater 1
+	ERRORS {
+		DataMissing,
+		-- NU1 DataMissing must not be used in version 1
+		UnexpectedDataValue,
+		UnknownSubscriber,
+		MessageWaitingListFull}
+
+NoteSubscriberPresent--
+	ARGUMENT
+		imsi		IMSI
+
+AlertServiceCentre ::= OPERATION				--Timer s--
+	ARGUMENT
+		alertServiceCentreArg	AlertServiceCentreArg
+	RESULT zzzz-Empty	NULL
+		-- OA1 RESULT must be absent in version 1
+		-- OU>1 RESULT must be used in version greater 1
+	ERRORS {
+		SystemFailure,
+		-- NU1 NU1 DataMissing must not be used in version 1
+		UnexpectedDataValue}
+		-- NU1 UnexpectedDataValue must not be used in version 1
+
+InformServiceCentre ::= OPERATION				--Timer s--
+	ARGUMENT
+		informServiceCentreArg	InformServiceCentreArg
+
+--<B--SendInfoForMT-SMS ::= OPERATION				--Timer s----B>--
+	ARGUMENT--B>--
+--<B--		sm-RP-DA	SM-RP-DA--B>--
+--<B--	RESULT--B>--
+--<B--		msisdn	ISDN-AddressString
+--<B--	ERRORS {--B>--
+--<B--		SystemFailure,--B>--
+--<B--		DataMissing,--B>--
+		UnexpectedDataValue,--B>--
+--<B--		UnknownSubscriber,--B>--
+--<B--		UnidentifiedSubscriber,--B>--
+--<B--		IllegalSubscriber,
+--<B--		IllegalEquipment,--B>--
+--<B--		AbsentSubscriber}--B>--
+
+--<B--SendInfoForMO-SMS ::= OPERATION				--Timer s----B>----<B--	ARGUMENT--B>--
+--<B--		serviceCentreAddress	AddressString--B>--
+--<B--	RESULT--B>--
+--<B----B>--
+--<B--	ERRORS {--B>--
+--<B--		DataMissing,--B>--
+--<B--		UnexpectedDataValue,--B>----<B--		TeleserviceNotProvisioned,--B>--
+--<B--		CallBarred}--B>--
+
+ReadyForSM ::= OPERATION				--Timer m--
+	ARGUMENT
+		readyForSM-Arg	ReadyForSM-Arg
+	RESULT zzzz-Empty	NULL
+--- MODULE 'MAP-Errors' START ---
+MAP-Errors {
+   ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
+   moduleId (3) map-Errors (10) version2 (2)}
+
+DEFINITIONS
+
+::=
+
+BEGIN
+
+EXPORTS
+
+	-- generic errors
+	SystemFailure,
+	DataMissing,
+	UnexpectedDataValue,
+	FacilityNotSupported,
+
+	-- identification and numbering errors
+	UnknownSubscriber,
+	NumberChanged,
+	UnknownBaseStation,
+	UnknownMSC,
+--<B--	UnknownLocArea,--B>--
+	UnidentifiedSubscriber,
+--<B--	UnallocatedRoamingNumber,--B>--
+	UnknownEquipment,
+
+	-- subscription errors
+	RoamingNotAllowed,
+	IllegalSubscriber,
+	IllegalEquipment,
+	BearerServiceNotProvisioned,
+	TeleserviceNotProvisioned,
+
+	-- handover errors
+	InvalidTargetBaseStation,
+	NoRadioResourceAvailable,
+	NoHandoverNumberAvailable,
+	SubsequentHandoverFailure,
+
+	-- operation and maintenance errors
+	TracingBufferFull,
+
+	-- call handling errors
+	NoRoamingNumberAvailable,
+	AbsentSubscriber,
+	BusySubscriber,--B>--
+--<B--	NoSubscriberReply,--B>--
+--<B--	RadioCongestion,--B>--
+--<B--	ImpossibleCallCompletion,
+	CallBarred,
+	ForwardingViolation,
+	CUG-Reject,
+
+	-- supplementary service errors
+	IllegalSS-Operation,
+	SS-ErrorStatus,
+	SS-NotAvailable,
+	SS-SubscriptionViolation,
+	SS-Incompatibility,
+	SS-PartialAcceptance,
+	SS-NotDelivered,
+	PW-RegistrationFailure,
+	NegativePW-Check,
+	NumberOfPW-AttemptsViolation,
+
+	-- short message service errors
+	SM-DeliveryFailure,
+	MessageWaitingListFull
+;
+
+IMPORTS
+	ERROR
+FROM TCAPMessages {ccitt recommendation q 773 modules(2) messages (1)}
+
+	SS-Status,
+	SS-SubscriptionOption--<B--,--B>--
+--<B--	SS-List--B>--
+FROM MAP-SS-DataTypes {
+   ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
+   moduleId (3) map-SS-DataTypes (14) version2 (2)}
+
+	RoamingNotAllowedCause,
+--<B--	BusySubscriberCause,--B>--
+	CallBarringCause,
+	CUG-RejectCause,
+	SS-IncompatibilityCause,
+	PW-RegistrationFailureCause,
+	SM-DeliveryFailureCause
+FROM MAP-ER-DataTypes {
+   ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
+   moduleId (3) map-ER-DataTypes (17) version2 (2)}
+
+	NetworkResource
+FROM MAP-CommonDataTypes {
+   ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
+   moduleId (3) map-CommonDataTypes (18) version2 (2)}
+;
+
+
+-- generic errors
+
+SystemFailureDataMissing ::= ERROR
+
+UnexpectedDataValue ::= ERROR
+
+FacilityNotSupported ::= ERROR
+
+
+-- identification and numbering errors
+
+UnknownSubscriber ::= ERROR
+
+NumberChanged ::= ERROR
+
+UnknownBaseStation ::= ERROR
+
+UnknownMSC ::= ERROR
+
+--<B--UnknownLocArea--B>--
+
+UnidentifiedSubscriber ::= ERROR
+
+--<B--UnallocatedRoamingNumber ::= ERROR--B>--
+
+UnknownEquipment ::= ERROR
+
+
+-- subscription errors
+
+RoamingNotAllowed ::= ERROR
+	PARAMETER
+		roamingNotAllowedCause	RoamingNotAllowedCause
+		-- optional
+		-- OA! OP>1 roamingNotAllowedCause must be present in version greater 1
+
+IllegalSubscriber ::= ERROR
+
+IllegalEquipment ::= ERROR
+
+BearerServiceNotProvisioned ::= ERROR
+
+TeleserviceNotProvisioned ::= ERROR
+
+
+-- handover errors
+
+InvalidTargetBaseStation ::= ERROR
+
+NoRadioResourceAvailable ::= ERROR
+
+NoHandoverNumberAvailable ::= ERROR
+
+ ::= ERROR
+
+
+-- operation and maintenance errors
+
+TracingBufferFull ::= ERROR
+
+
+-- call handling errors
+
+NoRoamingNumberAvailable ::= ERROR
+
+AbsentSubscriber ::= ERROR
+	PARAMETER
+		mwd-Set	BOOLEAN
+		-- optional
+		-- OA>1 mwd-Set must be absent in version greater 1
+
+--<B--BusySubscriber ::= ERROR--B>--
+	PARAMETER--B>--
+--<B--		busySubscriberCause	BusySubscriberCause--B>--
+--<B--		-- optional----B>--
+
+--<B--NoSubscriberReply--B>--
+
+--<B--RadioCongestion ::= ERROR--B>--
+
+--<B--ImpossibleCallCompletion ::= ERROR--B>--
+--<B----B>--
+--<B--		ss-List	SS-List--B>--
+--<B--		-- optional----B>--
+
+CallBarred ::= ERROR
+	PARAMETER
+		callBarringCause	CallBarringCause
+		-- optional
+
+ForwardingViolation ::= ERROR
+
+ ::= ERROR
+	PARAMETER
+		cug-RejectCause	CUG-RejectCause
+		-- optional
+
+
+-- supplementary service errors
+
+IllegalSS-Operation ::= ERROR
+
+SS-ErrorStatus ::= ERROR
+	PARAMETER
+		ss-Status	SS-Status
+		-- optional
+
+SS-NotAvailable ::= ERROR
+
+SS-SubscriptionViolation ::= ERROR
+	PARAMETER
+		ss-SubscriptionOption	SS-SubscriptionOption
+		-- optional
+
+SS-Incompatibility ::= ERROR
+	PARAMETER
+		ss-IncompatibilityCause	SS-IncompatibilityCause
+		-- optional
+
+SS-PartialAcceptance ::= ERROR
+
+SS-NotDelivered ::= ERROR
+
+PW-RegistrationFailureNegativePW-Check ::= ERROR
+
+NumberOfPW-AttemptsViolation ::= ERROR
+
+
+-- short message service errors
+
+SM-DeliveryFailure ::= ERROR
+	PARAMETER
+		sm-DeliveryFailureCause	SM-DeliveryFailureCause
+
+MessageWaitingListFull ::= ERROR
+
+
+--- MODULE 'MAP-MS-DataTypes' START ---
+MAP-MS-DataTypes {
+   ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
+   moduleId (3) map-MS-DataTypes (11) version2 (2)}
+
+DEFINITIONS
+
+IMPLICIT TAGS
+
+::=
+
+BEGIN
+
+EXPORTS
+
+	-- location registration types
+--<B----B>--
+	UpdateLocationArg,
+	UpdateLocationRes,
+	CancelLocationArg,
+	PurgeMS-Arg,
+	SendIdentificationRes,
+--<B--	SRES,--B>--
+
+	-- page management types
+--<B--	PageArg,--B>--
+--<B--	SearchForMS-Arg,--B>----<B--	ProcessAccessRequestArg,--B>--
+--<B--	ProcessAccessRequestRes,--B>--
+
+	-- handover types
+	PerformHO-Arg,
+	PerformHO-Res,
+	PerformSubsequentHO-Arg,
+
+	-- authentication management types
+--<B--	AuthenticateArg,--B>--
+	SendAuthenticationInfoArg,
+	SendAuthenticationInfoRes,
+
+	-- security management types
+--<B----B>--
+	CheckIMEI-Arg,
+
+	-- subscriber management types
+	SendParametersArg,
+	SentParameterList,
+	InsertSubscriberDataArg,
+	InsertSubscriberDataRes,
+	DeleteSubscriberDataArg,
+
+	-- fault recovery types
+	ResetArg,
+	RestoreDataArg,
+	RestoreDataRes
+;
+
+IMPORTS
+	SS-List,
+	SS-InfoList
+FROM MAP-SS-DataTypes {
+   ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
+   moduleId (3) map-SS-DataTypes (14) version2 (2)}
+
+	TBCD-STRING,
+	ISDN-AddressString,
+	ExternalSignalInfo,
+	IMSI,
+--<B--	TMSI,--B>--
+	SubscriberId,
+	IMEI,
+--<B--	LocAreaId,--B>--
+--<B--	LocAreaIdOrNone,--B>----<B--UpdateLocationAreaArg ::= SEQUENCE {--B>--
+--<B--	subscriberId	SubscriberId,--B>--
+--<B--	previousLocAreaId	LocAreaIdOrNone,--B>--
+	targetLocAreaId	LocAreaId,--B>--
+--<B--	cksn			CKSN			OPTIONAL}--B>--
+--<B--	-- OP1 cksn must be present in version 1----B>--UpdateLocationArg ::= SEQUENCE {
+	imsi		IMSI,
+	locationInfo	LocationInfo,
+	vlr-Number	ISDN-AddressString,
+	lmsi			[10] LMSI	OPTIONAL}
+
+UpdateLocationRes ::= CHOICE {
+	hlr-Number	ISDN-AddressString,
+	-- NU>1 hlr-Number must not be used in version greater 1
+	hlr-NumberWithRoamingRestrictions	HLR-NumberWithRoamingRestrictions}
+	-- NU1 hlr-NumberWithRoamingRestrictions must not be used in version 1
+
+HLR-NumberWithRoamingRestrictions ::= SEQUENCE {
+	hlr-Number	ISDN-AddressString,
+	roamingRestrictions	ZoneCodeList	OPTIONAL}
+
+ZoneCodeList ::= SEQUENCE SIZE (1..maxNumOfZoneCodes)
+				OF ZoneCode
+
+ZoneCode ::= TBCD-STRING (SIZE (3..8))
+	-- digits of MCC, MNC, VLRI, ZI are concatenated in this order.
+
+maxNumOfZoneCodesCancelLocationArg ::= CHOICE {
+	imsi			IMSI,
+	imsi-WithLMSI	IMSI-WithLMSI}
+
+PurgeMS-Arg ::= SEQUENCE {
+	imsi			IMSI,
+	vlr-Number	ISDN-AddressString}
+
+IMSI-WithLMSI ::= SEQUENCE {
+		imsi		IMSI,
+		lmsi		LMSI}
+
+SendIdentificationRes ::= SEQUENCE {
+	imsi			IMSI,
+	authenticationSetList	AuthenticationSetList	OPTIONAL}
+
+AuthenticationSetList ::= SEQUENCE SIZE (1..5) OF
+				AuthenticationSet
+
+AuthenticationSet ::= SEQUENCE {
+	rand			RAND,
+	sres			SRES,
+	kc			Kc}
+
+RAND ::= OCTET STRING (SIZE (16))
+
+SRES ::= OCTET STRING (SIZE (4))
+
+ ::= OCTET STRING (SIZE (8))
+
+
+-- page management types
+
+--<B--PageArg ::= SEQUENCE {--B>--
+--<B--	imsi			[0] IMSI,--B>--
+--<B--	tmsi			[1] TMSI		OPTIONAL,--B>----<B--	locAreaId	[2] LocAreaId}--B>--
+
+--<B--SearchForMS-Arg ::= SEQUENCE {--B>--
+--<B--	imsi			IMSI,--B>--
+	storedLocAreaId	LocAreaIdOrNone}--B>--
+
+
+-- access management types
+
+--<B--ProcessAccessRequestArg ::= SEQUENCE {--B>--
+--<B--	subscriberIdOrIMEI	SubscriberIdOrIMEI,--B>--
+--<B----B>--
+--<B--	accessConnectionStatus	AccessConnectionStatus,--B>--
+--<B--	cksn			CKSN,--B>--
+--<B--	targetLocArea	LocAreaId	OPTIONAL}--B>--OA1 targetLocAreas must be absent in version 1
+	-- OP>1 targetLocArea must be present in version greater 1
+
+--<B--SubscriberIdOrIMEI ::= CHOICE {--B>--
+--<B--	subscriberID	SubscriberId,--B>--
+	imei			[2] IMEI}--B>--
+	-- NU1 imei must not be used in version 1
+
+--<B--CM-ServiceType ::= ENUMERATED {--B>--
+--<B--	mobileOriginatingCallorPacketMode  (1),--B>----<B--	emergencyCallEstablishment  (2),--B>--
+--<B--	shortMessageService  (4),--B>--
+--<B--	ss-Activation  (8),--B>--
+--<B----B>--
+--<B--	mobileTerminatingCall  (10)}--B>--
+
+--<B--AccessConnectionStatus ::= OCTET STRING (SIZE (1))--B>--
+
+	-- bits 87654: 00000 (unused)
+
+	-- bit 3:
+	--	0  no RR-connection
+	--	1  RR-connection established
+
+	-- bit 2:
+	--	0  ciphering mode off
+	--	1  ciphering mode on
+
+	-- bit 1:
+	--	0  MM-connection existing and authenticated
+	--	1  MM-connection existing and not authenticated
+
+--<B--ProcessAccessRequestRes--B>--
+--<B--	imsi-OrIMEI	IMSI-OrIMEI,--B>--
+--<B--	msisdn		ISDN-AddressString	OPTIONAL}--B>--
+
+--<B--IMSI-OrIMEI ::= CHOICE {
+--<B--	imsi			IMSI,--B>--
+--<B--	imei			[0] IMEI}--B>--
+	-- NU1 imei must not be used in version 1
+
+-- handover types
+
+PerformHO-Arg ::= SEQUENCE {
+	targetCellId	GlobalCellId,
+	servingCellId	GlobalCellId,
+	channelType	ChannelType,
+	classmarkInfo	ClassmarkInfo,
+	handoverPriority	[11] HandoverPriority	OPTIONAL,
+	handoverReason	[13] HandoverReason	OPTIONAL,
+	-- OA1ChannelType ::= OCTET STRING (SIZE (1..10))
+	-- concatenation of
+	-- speech data indicator
+	-- channel rate
+	-- speech encoding algorithm/ data rate 
+	-- and transparency indicator
+	-- as defined in GSM 08.08
+
+ClassmarkInfo ::= OCTET STRING (SIZE (1..2))
+	-- classmark information element type 1 or 2 contents as defined in
+	-- GSM 08.08
+
+HandoverPriority ::= OCTET STRING (SIZE (1))
+	-- The internal structure is defined in GSM 08.08.
+
+HandoverReason ::= OCTET STRING (SIZE (1..2))
+	-- the internal structure is defined in GSM 08.08
+
+PerformHO-Res ::= SEQUENCE {
+	handoverNumber	ISDN-AddressString,
+	accessSignalInfo	ExternalSignalInfo}
+
+PerformSubsequentHO-Arg ::= SEQUENCE {
+	targetCellId	GlobalCellId,
+	servingCellId	GlobalCellId,
+	targetMSC-Number	ISDN-AddressString,
+	classmarkInfo	[10] ClassmarkInfo	OPTIONAL}
+
+
+-- authentication management types
+
+--<B--AuthenticateArg ::= SEQUENCE {
+--<B--	rand			RAND,--B>--
+--<B--	cksn			CKSN}--B>--
+
+--<B--CKSN ::= OCTET STRING (SIZE (1))--B>--SendAuthenticationInfoArg ::= IMSI
+
+SendAuthenticationInfoRes ::= AuthenticationSetList
+
+Ki ::= OCTET STRING (SIZE (16))
+
+
+-- security management types
+
+--<B--SetCipheringModeArg ::= SEQUENCE {--B>--
+--<B--	cipheringMode	CipheringMode,--B>----<B--	kc			Kc			OPTIONAL}--B>--
+
+--<B--CipheringMode ::= ENUMERATED {--B>--
+--<B--	noEncryption  (1),--B>--
+	version1-GSM  (2)}--B>--
+
+CheckIMEI-Arg ::= CHOICE {
+	equipmentStatus	EquipmentStatus,
+	imei-withEquipmentStatus	IMEI-withEquipmentStatus}
+	-- NU1 imei-withEquipmentStatus must not be used in version 1
+
+IMEI-withEquipmentStatus ::= SEQUENCE {
+	imei		IMEI,
+	equipmentStatus	EquipmentStatus}
+
+EquipmentStatus ::= ENUMERATED {
+	whiteListed  (0),
+	blackListed  (1),
+	greyListed  (2)}
+
+
+-- subscriber management types
+
+SendParametersArg ::= SEQUENCE {
+	subscriberId	SubscriberId,
+	requestParameterList	RequestParameterList}
+
+RequestParameterList ::= SEQUENCE SIZE (1..2) OF
+				RequestParameter
+
+ ::= ENUMERATED {
+	requestIMSI  (0),
+	requestAuthenticationSet  (1),
+	requestSubscriberData  (2),
+	requestKi  (4)}
+
+SentParameterList ::= SEQUENCE SIZE (1..maxNumOfSentParameter) OF
+				SentParameter
+
+SentParameter ::= CHOICE {
+	imsi			[0] IMSI,
+	authenticationSet	[1] AuthenticationSet,
+	subscriberData	[2] SubscriberData,
+	ki			[4] Ki}
+
+maxNumOfSentParameter  INTEGER ::= 6
+	-- This NamedValue corresponds to the maximum number of authentication set which may
+	-- be returned by a HLR plus 1.
+
+InsertSubscriberDataArg ::= SEQUENCE {
+	imsi			[0] IMSI		OPTIONAL,
+	COMPONENTS OF	SubscriberData}
+
+SubscriberData ::= SEQUENCE {
+	msisdn		[1] ISDN-AddressString	OPTIONAL,
+	category		[2] Category	OPTIONAL,
+	subscriberStatus	[3] SubscriberStatus	OPTIONAL,
+	bearerServiceList	[4] BearerServiceList	OPTIONAL,
+	teleserviceList	[6] TeleserviceList	OPTIONAL,
+	provisionedSS	[7] SS-InfoList	OPTIONAL,
+	odb-Data		[8] ODB-Data	OPTIONAL}
+	-- OA1 odb-Data must be absent in version 1
+
+SubscriberStatus ::= ENUMERATED {
+	serviceGranted  (0),
+	operatorDeterminedBarring  (1)}
+
+ODB-DataODB-GeneralData ::= BIT STRING {
+	allOG-CallsBarred  (0),
+	internationalOGCallsBarred  (1),
+	internationalOGCallsNotToHPLMN-CountryBarred  (2),
+	premiumRateInformationOGCallsBarred  (3),
+	premiumRateEntertainementOGCallsBarred  (4),
+	ss-AccessBarred  (5)} (SIZE (6))
+
+ODB-HPLMN-Data ::= BIT STRING {
+	plmn-SpecificBarringType1  (0),
+	plmn-SpecificBarringType2  (1),
+	plmn-SpecificBarringType3  (2),
+	plmn-SpecificBarringType4  (3)} (SIZE (4))
+
+InsertSubscriberDataRes ::= SEQUENCE {
+	teleserviceList	[1] TeleserviceList	OPTIONAL,
+	bearerServiceList	[2] BearerServiceList	OPTIONAL,
+	ss-List		[3] SS-List	OPTIONAL,
+	odb-GeneralData	[4] ODB-GeneralData	OPTIONAL}
+
+DeleteSubscriberDataArg ::= SEQUENCE {
+	imsi			[0] IMSI,
+	basicServiceList	[1] BasicServiceList	OPTIONAL,
+	ss-List		[2] SS-List	OPTIONAL}
+
+
+-- fault recovery types
+
+ResetArg ::= SEQUENCE {
+	networkResource	NetworkResource	OPTIONAL,
+	-- OP1 networkResource must be present in version 1
+	-- OA>1 networkResource must be absent in version greater 1
+	hlr-Number	ISDN-AddressString,
+	hlr-List		HLR-List		OPTIONAL}
+
+RestoreDataArgRestoreDataRes ::= SEQUENCE {
+	COMPONENTS OF	HLR-NumberWithRoamingRestrictions,
+	msNotReachable	NULL			OPTIONAL}
+
+
+--- MODULE 'MAP-OM-DataTypes' START ---
+MAP-OM-DataTypes {
+   ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
+   moduleId (3) map-OM-DataTypes (12) version2 (2)}
+
+DEFINITIONS
+
+IMPLICIT TAGS
+
+::=
+
+BEGIN
+
+EXPORTS
+	ActivateTraceModeArg,
+	DeactivateTraceModeArg,
+	TraceSubscriberActivityArg,
+	NoteInternalHO-Arg
+;
+
+IMPORTS
+	AddressString,
+	ExternalSignalInfo,
+	IMSI,
+	GlobalCellId
+FROM MAP-CommonDataTypes {
+   ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
+   moduleId (3) map-CommonDataTypes (18) version2 (2)}
+;
+
+
+ActivateTraceModeArg ::= SEQUENCE {
+	imsi			[0] IMSI		OPTIONAL,
+	traceReference	[1] TraceReference,
+	traceType	[2] TraceType,
+	omc-Id		[3] AddressString	OPTIONAL}
+
+TraceReference ::= OCTET STRING (SIZE (1..2))
+
+TraceType ::= INTEGER {
+	allEvents  (0),
+	onlyCalls  (1),
+	eventSet1  (2),
+	eventSet254  (255)}
+	(0..255)
+	-- Identifiers eventSet1 to eventSet254  correspond to sets of events
+	-- predefined by each operator.
+
+DeactivateTraceModeArg ::= SEQUENCE {
+	imsi			[0] IMSI		OPTIONAL,
+	traceReference	[1] TraceReference}
+
+ ::= SEQUENCE {
+	imsi			[0] IMSI		OPTIONAL,
+	traceReference	[1] TraceReference,
+	traceType	[2] TraceType,
+	omc-Id		[3] AddressString	OPTIONAL,
+	callReference	[4] CallReference	OPTIONAL}
+
+CallReference ::= OCTET STRING (SIZE (1..3))
+
+NoteInternalHO-Arg ::= SEQUENCE {
+	handoverType	HandoverType,
+	targetCellId	[1] GlobalCellId	OPTIONAL,
+	channelId	[2] ExternalSignalInfo	OPTIONAL}
+
+HandoverType ::= ENUMERATED {
+	interBSS  (0),
+	intraBSS  (1)}
+
+
+--- MODULE 'MAP-CH-DataTypes' START ---
+MAP-CH-DataTypes {
+   ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
+   moduleId (3) map-CH-DataTypes (13) version2 (2)}
+
+DEFINITIONS
+
+IMPLICIT TAGS
+
+::=
+
+BEGIN
+
+EXPORTS
+--<B--	InfoForIC-Arg,
+--<B--	ConnectToFollowingAddressArg,--B>--
+--<B--	ProcessCallWaitingArg,--B>--
+--<B--	InfoForOC-Arg,--B>--
+	SendRoutingInfoArg,
+	SendRoutingInfoRes,
+	ProvideRoamingNumberArg,--B>--
+--<B--	CompleteCallArg--B>--
+;
+
+IMPORTS
+--<B--	NoReplyConditionTime,--B>--
+--<B--	CUG-Index,
+	CUG-Interlock,
+--<B--	SS-DataList,--B>--
+	ForwardingData
+FROM MAP-SS-DataTypes {
+   ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
+   moduleId (3) map-SS-DataTypes (14) version2 (2)}
+
+	ISDN-AddressString,
+	ExternalSignalInfo,
+	IMSI,
+--<B--	IMEI,--B>--
+	LMSI--<B--,--B>--
+	Category,--B>--
+--<B--	BasicServiceCode--B>--
+FROM MAP-CommonDataTypes {
+   ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
+   moduleId (3) map-CommonDataTypes (18) version2 (2)}
+;
+
+
+--<B--InfoForIC-Arg ::= SEQUENCE {--B>--
+--<B----B>--
+--<B--	basicService	BasicServiceCode	OPTIONAL,--B>--
+--<B--		dialledNumber	[5] ISDN-AddressString	OPTIONAL,--B>--
+--<B--	cug-CheckInfo	[6] CUG-CheckInfo	OPTIONAL,
+	-- OA1 cug-CHeckInfo must be absent in version 1
+--<B--	numberOfForwarding	[7] NumberOfForwarding	OPTIONAL}--B>--
+
+CUG-CheckInfo ::= SEQUENCE {
+	cug-Interlock	CUG-Interlock,
+	cug-OutgoingAccess	NULL			OPTIONAL}
+
+NumberOfForwarding ::= INTEGER (1..5)
+
+--<B--ConnectToFollowingAddressArg ::= SEQUENCE {
+--<B--	forwardingData	ForwardingData,--B>--
+--<B--	msisdn		ISDN-AddressString	OPTIONAL,--B>--
+--<B--	cug-CheckInfo	CUG-CheckInfo	OPTIONAL}--B>--
+	-- cug-CheckInfo must be absent in version 1
+
+--<B--ProcessCallWaitingArg ::= SEQUENCE {--B>--
+--<B--	msisdn		[0] ISDN-AddressString,--B>--
+--<B--	cug-Index	[1] CUG-Index	OPTIONAL,--B>----<B--	gsm-BearerCapability	[2] ExternalSignalInfo	OPTIONAL,--B>--
+--<B--	networkSignalInfo	[3] ExternalSignalInfo	OPTIONAL,--B>--
+--<B--	noReplyConditionTime	[4] NoReplyConditionTime	OPTIONAL,--B>--
+--<B----B>--
+
+--<B--InfoForOC-Arg ::= SEQUENCE {--B>--
+--<B--	calledNumber	[0] ISDN-AddressString,--B>--
+--<B--	basicService	BasicServiceCode	OPTIONAL,
+--<B--	cug-Index	[4] CUG-Index	OPTIONAL,--B>--
+	-- OA1 cug-Index must be absent in version 1
+--<B--	supressPrefCUG	[5] NULL		OPTIONAL,--B>--
+	-- OA1 supressPrefCUG must be absent in version 1
+	supressOutgoingAccess	[6] NULL		OPTIONAL}--B>--
+	-- OA1 supressOutgoingAccess must be absent in version 1
+
+SendRoutingInfoArg ::= SEQUENCE {
+	msisdn		[0] ISDN-AddressString,
+	cug-CheckInfo	[1] CUG-CheckInfo	OPTIONAL,
+	-- OA1 cug-CheckInfo must be absent in version 1
+	numberOfForwarding	[2] NumberOfForwarding	OPTIONAL,
+	networkSignalInfo	[10] ExternalSignalInfo	OPTIONAL}
+
+SendRoutingInfoRes ::= SEQUENCE {
+	imsi			IMSI,
+	routingInfo	RoutingInfo,
+	cug-CheckInfo	CUG-CheckInfo	OPTIONAL}
+	-- OA1 cug-CheckInfo must be absent in version 1
+
+RoutingInfoProvideRoamingNumberArg ::= SEQUENCE {
+	imsi			[0] IMSI,
+	msc-Number	[1] ISDN-AddressString	OPTIONAL,
+	-- OP>1 msc-Number must be present in version greater 1
+	msisdn		[2] ISDN-AddressString	OPTIONAL,
+	previousRoamingNumber	[3] ISDN-AddressString	OPTIONAL,
+	lmsi			[4] LMSI		OPTIONAL,
+	gsm-BearerCapability	[5] ExternalSignalInfo	OPTIONAL,
+	networkSignalInfo	[6] ExternalSignalInfo	OPTIONAL}
+
+--<B--CompleteCallArg ::= SEQUENCE {--B>--
+--<B--	msisdnOrIMEI	MSISDN-OrIMEI,--B>----<B--	category		[1] Category	OPTIONAL,--B>--
+--<B--	cug-Index	[2] CUG-Index	OPTIONAL,--B>--
+	-- NU1 cug-INDEX must not be used in version 1
+--<B--	gsm-BearerCapability	[3] ExternalSignalInfo	OPTIONAL,--B>----<B--	networkSignalInfo	[7] ExternalSignalInfo	OPTIONAL,--B>--
+	-- OA1 networkSignalInfo must be absent in version 1
+--<B--	noReplyConditionTime	[4] NoReplyConditionTime	OPTIONAL,--B>--
+--<B--	ss-DataList	[5] SS-DataList	OPTIONAL,--B>--
+--<B----B>--
+	-- OA1 cug-CheckInfo must be absent in version 1
+
+--<B--MSISDN-OrIMEI ::= CHOICE {--B>--
+--<B--	msisdn		[0] ISDN-AddressString,--B>--
+--<B--	imei			[8] IMEI}
+	-- NU1 imei must not be used in version 1
+
+
+--- MODULE 'MAP-SS-DataTypes' START ---
+MAP-SS-DataTypes {
+   ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
+   moduleId (3) map-SS-DataTypes (14) version2 (2)}
+
+DEFINITIONS
+
+IMPLICIT TAGS
+
+::=
+
+BEGIN
+
+EXPORTS
+	RegisterSS-Arg,
+--<B--	NoReplyConditionTime,--B>--
+	SS-Info,
+	SS-Status,
+--<B----B>--
+	CUG-Interlock,
+	SS-SubscriptionOption,
+	SS-ForBS-Code,
+	InterrogateSS-Res,
+	SS-UserData,
+	ProcessSS-RequestArg,
+	SS-DigitString,
+	ToneOrDisplay,
+	SS-GetDigitsArg,
+	SS-GetStringArg,
+	SS-GetStringRes,
+	Password,
+	GuidanceInfo,
+	BeginSubscriberActivityArg,
+
+	SS-List,
+	SS-InfoList,
+--<B--	SS-DataList,--B>--
+	ForwardingData
+;
+
+IMPORTS
+	AddressString,
+	ISDN-AddressString,
+	ISDN-SubaddressString,
+	maxSignalInfoLength,
+	IMSI,
+	IMEI,
+	BasicServiceCode,
+	BasicServiceGroupList,
+	maxNumOfBasicServiceGroups
+FROM MAP-CommonDataTypes {
+   ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
+   moduleId (3) map-CommonDataTypes (18) version2 (2)}
+
+	SS-Code
+FROM MAP-SS-Code {
+   ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
+   moduleId (3) map-SS-Code (15) version2 (2)}
+;
+
+
+RegisterSS-Arg ::= SEQUENCE{
+	ss-Code		SS-Code,
+	basicService	BasicServiceCode	OPTIONAL,
+	forwardedToNumber	[4] AddressString	OPTIONAL,
+	forwardedToSubaddress	[6] ISDN-SubaddressString	OPTIONAL,
+	-- OA1 forwardedToSubaddress must be absent in version 1
+	noReplyConditionTime	[5] NoReplyConditionTime	OPTIONAL}
+
+NoReplyConditionTime ::= INTEGER (5..30)
+
+SS-Info ::= CHOICE {
+	forwardingInfo	[0] ForwardingInfo,
+	callBarringInfo	[1] CallBarringInfo,
+	cug-Info	[2] CUG-Info,
+	ss-Data		[3] SS-Data}
+
+ ::= SEQUENCE {
+	ss-Code		SS-Code		OPTIONAL,
+	forwardingFeatureList	ForwardingFeatureList}
+
+ForwardingFeatureList ::= SEQUENCE SIZE (1..maxNumOfBasicServiceGroups) OF
+				ForwardingFeature
+
+ForwardingFeature ::= SEQUENCE {
+	basicService	BasicServiceCode	OPTIONAL,
+	ss-Status		[4] SS-Status	OPTIONAL,
+	-- OP1 ss-Status must be present in version 1
+	forwardedToNumber	[5] ISDN-AddressString	OPTIONAL,
+	forwardedToSubaddress	[8] ISDN-SubaddressString	OPTIONAL,
+	-- OA1 forwardedToSubaddress must be absent in version 1
+	forwardingOptions	[6] ForwardingOptions	OPTIONAL,
+	noReplyConditionTime	[7] NoReplyConditionTime	OPTIONAL}
+
+SS-Status ::= OCTET STRING (SIZE (1))
+
+	-- bits 8765: 0000 (unused)
+
+	-- bit 4: quiescent/operative indicator (only if bit 1 = 1)
+	--	0  operative
+	--	1  quiescent
+
+	-- bit 3: provision indicator
+	--	0  not provisioned
+	--	1  provisioned
+
+	-- bit 2: registration indicator (if applicable)
+	--	0  not registered
+	--	1  registered
+
+	-- bit 1: activation indicator (if applicable)
+	--	0  not active
+	--	1  active
+
+ForwardingOptions ::= OCTET STRING (SIZE (1))
+
+	-- v1: bits 87: notification to forwarding party
+	--	00  no notification
+	--	01  notification
+	--	10  notification
+
+	-- v2: bit 8: notification to forwarding party
+	--	0  no notification
+	--	1  notification
+
+	-- v2: bit 7: 0 (unused)
+
+	-- v1: bits 65: notification to calling party
+	--	00  no notification
+	--	01  notification
+	--	10  notification
+
+	-- v2: bit 6: v2: notification to calling party
+	--	0  no notification
+	--	1  notification
+
+	-- v2: bit 5: 0 (unused)
+
+	-- v2: bits 43: forwarding reason
+	--	00  ms not reachable
+	--	01  ms busy
+	--	10  no reply
+	--	11  unconditional
+	-- bits 21: 00 (unused)
+
+CallBarringInfo ::= SEQUENCE {
+	ss-Code		SS-Code		OPTIONAL,
+	-- ss-Code must be present in version 1
+	callBarringFeatureList	CallBarringFeatureList}
+
+CallBarringFeatureList ::= SEQUENCE SIZE (1..maxNumOfBasicServiceGroups) OF
+				CallBarringFeature
+
+CallBarringFeature ::= SEQUENCE {
+	basicService	BasicServiceCode	OPTIONAL,
+	ss-Status	[4] SS-Status	OPTIONAL}
+	-- OP1 ss-Status must be present in version 1
+
+CUG-Info ::= SEQUENCE {
+	cug-SubscriptionList	CUG-SubscriptionList,
+	cug-FeatureList	CUG-FeatureList	OPTIONAL}
+
+CUG-SubscriptionList ::= SEQUENCE SIZE (1..maxNumOfCUG) OF
+				CUG-Subscription
+
+CUG-Subscription ::= SEQUENCE {
+	cug-Index	CUG-Index,
+	cug-Interlock	CUG-Interlock,
+	intraCUG-Options	IntraCUG-Options,
+	basicServiceGroupList	BasicServiceGroupList	OPTIONAL}
+
+CUG-Index ::= INTEGER (0..32767)
+	-- The internal structure is defined in TS ETS 300 138:1991.
+
+CUG-InterlockIntraCUG-Options ::= ENUMERATED {
+	noCUG-Restrictions  (0),
+	cugIC-CallBarred  (1),
+	cugOG-CallBarred  (2)}
+
+maxNumOfCUG  INTEGER ::= 10
+
+CUG-FeatureList ::= SEQUENCE SIZE (1..maxNumOfBasicServiceGroups) OF
+				CUG-Feature
+
+CUG-Feature ::= SEQUENCE {
+	basicService	BasicServiceCode	OPTIONAL,
+	preferentialCUG-Indicator	CUG-Index	OPTIONAL,
+	interCUG-Restrictions	InterCUG-Restrictions}
+
+InterCUG-Restrictions::= OCTET STRING (SIZE (1))
+
+	-- bits 876543: 000000 (unused)
+
+	-- bits 21 
+	--	00  CUG only facilities
+	--	01  CUG with outgoing access
+	--	10  CUG with incoming access
+	--	11  CUG with both outgoing and incoming access
+
+SS-Data ::= SEQUENCE {
+	ss-Code	SS-Code,
+	ss-Status	[4] SS-Status	OPTIONAL,
+	ss-SubscriptionOption	SS-SubscriptionOption	OPTIONAL,
+	-- OA1 ss-SubscriptionOption must be absent in version 1
+	basicServiceGroupList	BasicServiceGroupList	OPTIONAL}
+	-- OA1 SS-SubscriptionOption ::= CHOICE {
+	presentationMode	[0] PresentationMode,
+	overrideCategory	[1] OverrideCategory}
+
+PresentationMode ::= ENUMERATED {
+	presentationPermanent  (0),
+	presentationPerCall  (1)}
+
+OverrideCategory ::= ENUMERATED {
+	overrideEnabled  (0),
+	overrideDisabled  (1)}
+
+SS-ForBS-Code ::= SEQUENCE {
+	ss-Code		SS-Code,
+	basicService	BasicServiceCode	OPTIONAL}
+
+InterrogateSS-Res ::= CHOICE {
+	ss-Status	[0] SS-Status,
+	forwardedToNumber	[1] ISDN-AddressString,
+	-- NU>1 forwardedToNumber must not be used in version greater 1
+	basicServiceGroupList	[2] BasicServiceGroupList,
+	forwardingFeatureList	[3] ForwardingFeatureList}
+
+SS-UserData ::= IA5String (SIZE (1.. maxSignalInfoLength))
+
+ProcessSS-RequestArg ::= SEQUENCE {
+	ss-featureAccessCode	SS-FeatureAccessCode,
+	equipmentType	EquipmentType	OPTIONAL,
+	ss-specificInfo	SS-SpecificInfo	OPTIONAL}
+
+ ::= OCTET STRING (SIZE (1..2))
+
+EquipmentType ::= SEQUENCE {
+	displayDeviceExists	NULL			OPTIONAL,
+	imei			IMEI}
+
+SS-SpecificInfo ::= CHOICE {
+	ss-unstructuredInfo	[1] SS-UnstructuredInfo,
+	ss-digitString	[2] SS-DigitString}
+
+SS-UnstructuredInfo ::= OCTET STRING (SIZE (1..32))
+
+SS-DigitString ::= IA5String
+	(FROM ("0"|"1"|"2"|"3"|"4"|"5"|"6"|"7"|"8"|"9"|"*"|"#")|--)
+	--(--SIZE (1..maxNumOfDigits))
+
+ ::= CHOICE {
+	nonRegisteredDisplay	[0] SS-DisplayString,
+	preRegisteredDisplay	[1] SS-StringReference,
+	tone			[2] Tone}
+
+SS-DisplayString ::= PrintableString (SIZE (1..32))
+
+SS-StringReference ::= INTEGER (1..127)
+
+Tone ::= INTEGER (1..127)
+
+SS-GetDigitsArg ::= SEQUENCE {
+	toneOrDisplay	ToneOrDisplay,
+	numberOfDigits	NumberOfDigits	OPTIONAL}
+
+NumberOfDigits ::= INTEGER (1..maxNumOfDigits)
+
+maxNumOfDigits  INTEGER ::= 20
+
+SS-GetStringArg ::= SEQUENCE {
+	toneOrDisplay	ToneOrDisplay,
+	stringLength	StringLength	OPTIONAL}
+
+StringLengthmaxStringLength  INTEGER ::= 200
+
+SS-GetStringRes ::= PrintableString(SIZE (1..maxStringLength))
+
+Password ::= NumericString
+	(FROM ("0"|"1"|"2"|"3"|"4"|"5"|"6"|"7"|"8"|"9")|--)
+	--(--SIZE (4))
+
+GuidanceInfo ::= ENUMERATED {
+	enterPW  (0),
+	enterNewPW  (1),
+	enterNewPW-Again  (2)}
+	-- How this information is really delivered to the subscriber (display,
+	-- announcement, ...) is not part of this specification.
+
+BeginSubscriberActivityArgSS-List ::= SEQUENCE SIZE (1..maxNumOfSS) OF
+				SS-Code
+
+maxNumOfSS  INTEGER ::= 30
+
+SS-InfoList ::= SEQUENCE SIZE (1..maxNumOfSS) OF
+				SS-Info
+
+--<B--SS-DataList ::= SEQUENCE SIZE (1..maxNumOfSS) OF--B>--
+--<B--				SS-Data--B>--ForwardingData ::= SEQUENCE {
+	forwardedToNumber	[5] ISDN-AddressString	OPTIONAL,
+	-- OP1 forwardedToNumber must be present in version 1 
+	forwardedToSubaddress	[4] ISDN-SubaddressString	OPTIONAL,
+	-- OA1 forwardedToSubaddress must be absent in version 1
+	forwardingOptions	[6] ForwardingOptions	OPTIONAL}
+
+
+--- MODULE 'MAP-SS-Code' START ---
+MAP-SS-Code {
+   ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
+   moduleId (3) map-SS-Code (15) version2 (2)}
+
+DEFINITIONS
+
+::=
+
+BEGIN
+
+SS-CodeallSS			SS-Code ::= '00000000'B
+	-- all SS
+
+allLineIdentificationSS	SS-Code ::= '00010000'B
+	--    all line identification SS
+clip			SS-Code ::= '00010001'B
+	--        calling line identification presentation
+clir			SS-Code ::= '00010010'B
+	--        calling line identification restriction
+colp			SS-Code ::= '00010011'B
+	--        connected line identification presentation
+colr			SS-Code ::= '00010100'B
+	--        connected line identification restriction
+mci			SS-Code ::= '00010101'B
+	--        malicious call identification
+
+allForwardingSS	SS-Code ::= '00100000'B
+	--    all forwarding SS
+			SS-Code ::= '00100001'B
+	--        call forwarding unconditional
+allCondForwardingSS	SS-Code ::= '00101000'B
+	--      all conditional forwarding SS
+cfb			SS-Code ::= '00101001'B
+	--        call forwarding on mobile subscriber busy
+cfnry			SS-Code ::= '00101010'B
+	--        call forwarding on no reply
+cfnrc			SS-Code ::= '00101011'B
+	--        call forwarding on mobile subscriber not reachable
+
+allCallOfferingSS	SS-Code ::= '00110000'B
+	--    all call offering SS includes also all forwarding SS
+ct				SS-Code ::= '00110001'B
+	--        call transfer
+mah			SS-Code ::= '00110010'B
+	--        mobile access hunting
+
+allCallCompletionSScw				SS-Code ::= '01000001'B
+	--        call waiting
+hold			SS-Code ::= '01000010'B
+	--        call hold
+ccbs			SS-Code ::= '01000011'B
+	--        completion of call to busy subscribers
+
+allMultiPartySS	SS-Code ::= '01010000'B
+	--    all multi-party SS
+multiPTY		SS-Code ::= '01010001'B
+	--    multi party
+
+allCommunityOfInterest-SS	SS-Code ::= '01100000'B
+	--    all community of interest SS
+cug			SS-Code ::= '01100001'B
+	--        closed user group
+
+allChargingSS	SS-Code ::= '01110000'B
+	--    all charging SS
+i			SS-Code ::= '01110001'B
+	--        advice of charge information
+aocc			SS-Code ::= '01110010'B
+	--        advice of charge charging
+
+allAdditionalInfoTransferSS	SS-Code ::= '10000000'B
+	--    all additional information transfer SS
+uus			SS-Code ::= '10000001'B
+	--        UUS user to user signalling
+
+allCallRestrictionSS	SS-Code ::= '10010000'B
+	--    all call restriction SS
+barringOfOutgoingCalls	SS-Code ::= '10010001'B
+	--      barring of outgoing calls
+baoc			SS-Code ::= '10010010'B
+	--        barring of all outgoing calls
+boic			SS-Code ::= '10010011'B
+	--        barring of outgoing international calls
+boicExHCbarringOfIncomingCalls	SS-Code ::= '10011001'B
+	--      barring of incoming calls
+baic			SS-Code ::= '10011010'B
+	--        barring of all incoming calls
+bicRoam			SS-Code ::= '10011011'B
+	--        barring of incoming calls when roaming outside home PLMN
+	--        Country
+
+allPLMN-specificSS	SS-Code ::= '11110000'B
+-- NU1 *plmn-specific* must not be used in version 1
+plmn-specificSS-1	SS-Code ::= '11110001'B
+plmn-specificSS-2	SS-Code ::= '11110010'B
+plmn-specificSS-3	SS-Code ::= '11110011'B
+	SS-Code ::= '11110100'B
+plmn-specificSS-5	SS-Code ::= '11110101'B
+plmn-specificSS-6	SS-Code ::= '11110110'B
+plmn-specificSS-7	SS-Code ::= '11110111'B
+plmn-specificSS-8	SS-Code ::= '11111000'B
+plmn-specificSS-9	SS-Code ::= '11111001'B
+plmn-specificSS-A	SS-Code ::= '11111010'B
+plmn-specificSS-B	SS-Code ::= '11111011'B
+plmn-specificSS-Cplmn-specificSS-D	SS-Code ::= '11111101'B
+plmn-specificSS-E	SS-Code ::= '11111110'B
+plmn-specificSS-F	SS-Code ::= '11111111'B
+
+
+--- MODULE 'MAP-SM-DataTypes' START ---
+MAP-SM-DataTypes {
+   ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
+   moduleId (3) map-SM-DataTypes (16) version2 (2)}
+
+DEFINITIONS
+
+IMPLICIT TAGS
+
+::=
+
+BEGIN
+
+EXPORTS
+	RoutingInfoForSM-Arg,
+	RoutingInfoForSM-Res,
+	ForwardSM-Arg,
+--<B--	SM-RP-DA,--B>--	TeleserviceCode, (CR202)
+	LMSI
+FROM MAP-CommonDataTypes {
+   ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
+   moduleId (3) map-CommonDataTypes (18) version2 (2)}
+
+	TeleserviceCode
+FROM MAP-TS-Code {
+   ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
+   moduleId (3) map-TS-Code (19) version2 (2)}
+;
+
+
+RoutingInfoForSM-Arg ::= SEQUENCE {
+	msisdn		[0] ISDN-AddressString,
+	sm-RP-PRI	[1] BOOLEAN,
+	serviceCentreAddress	[2] AddressString,
+	teleservice	[5] TeleserviceCode	OPTIONAL}
+	-- OA1 teleservice must be absent in version greater 1
+
+
+RoutingInfoForSM-Res::= SEQUENCE {
+	imsi			IMSI,
+	locationInfoWithLMSI	LocationInfoWithLMSI,
+	mwd-Set		[2] BOOLEAN	OPTIONAL}
+	-- OA>1 mwd-Set must be absent in version greater 1
+
+
+LocationInfoWithLMSI ::= SEQUENCE {
+		locationInfo	LocationInfo,
+		lmsi		LMSI			OPTIONAL}
+
+ForwardSM-Arg ::= SEQUENCE {
+	sm-RP-DA		SM-RP-DA,
+	sm-RP-OA		SM-RP-OA,
+	sm-RP-UI		SignalInfo,
+	moreMessagesToSend	NULL			OPTIONAL}
+	-- moreMessagesToSend must be absent in version 1
+
+SM-RP-DA ::= CHOICE {
+	imsi			[0] IMSI,
+	lmsi			[1] LMSI,
+	roamingNumber	[3] ISDN-AddressString,
+	serviceCentreAddressDA	[4] AddressString,
+	noSM-SP-DA	[5] NULL}
+	-- NU1 noSM-SP-DA must not be used in version 1
+
+SM-RP-OA ::= CHOICE {
+	msisdn		[2] ISDN-AddressString,
+	serviceCentreAddressOA	[4] AddressString,
+	noSM-RP-OA	[5] NULL}
+	-- NU1 noSM-SP-OA must not be used in version 1
+
+ReportSM-DeliveryStatusArg ::= SEQUENCE {
+	msisdn		ISDN-AddressString,
+	serviceCentreAddress	AddressString,
+	sm-DeliveryOutcome	SM-DeliveryOutcome	OPTIONAL}
+	-- OA1 sm-DeliveryOutcome must be absent in version 1
+	-- OP>1 SM-DeliveryOutcome ::= ENUMERATED {
+	memoryCapacityExceeded  (0),
+	absentSubscriber  (1),
+	successfulTransfer  (2)}
+
+AlertServiceCentreArg ::= SEQUENCE {
+	msisdn		ISDN-AddressString,
+	serviceCentreAddress	AddressString}
+
+InformServiceCentreArg ::= SEQUENCE {
+	storedMSISDN		ISDN-AddressString	OPTIONAL,
+	mw-Status		MW-Status	OPTIONAL}
+
+MW-Status ::= BIT STRING {
+	sc-AddressNotIncluded  (0),
+	mnrf-Set  (1),
+	msef-Set  (2)} (SIZE (6))
+
+ReadyForSM-Arg ::= SEQUENCE {
+	subscriberId	SubscriberId,
+	alertReason	AlertReason}
+
+AlertReason ::= ENUMERATED {
+	ms-Present  (0),
+	memoryAvailable  (1)}
+
+
+--- MODULE 'MAP-ER-DataTypes' START ---
+MAP-ER-DataTypes {
+   ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
+   moduleId (3) map-ER-DataTypes (17) version2 (2)}
+
+DEFINITIONS
+
+IMPLICIT TAGS
+
+::=
+
+BEGIN
+
+EXPORTS
+	RoamingNotAllowedCause,
+--<B--	BusySubscriberCause,--B>--
+	CallBarringCause,
+	CUG-RejectCause,
+	SS-IncompatibilityCause,
+	PW-RegistrationFailureCause,
+	SM-DeliveryFailureCause
+;
+
+IMPORTS
+	SS-Status
+FROM MAP-SS-DataTypes {
+   ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
+   moduleId (3) map-SS-DataTypes (14) version2 (2)}
+
+	BasicServiceCode
+FROM MAP-CommonDataTypes {
+   ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
+   moduleId (3) map-CommonDataTypes (18) version2 (2)}
+
+	SS-Code
+FROM MAP-SS-Code {
+   ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
+   moduleId (3) map-SS-Code (15) version2 (2)}
+;
+
+
+RoamingNotAllowedCause ::= ENUMERATED {
+	plmnRoamingNotAllowed  (0),
+	nationalRoamingNotAllowed  (1),
+	locationAreaNotAllowed  (2),
+	operatorDeterminedBarring  (3)}
+
+--<B--BusySubscriberCause ::= ENUMERATED {--B>--
+--<B----B>--
+--<B--	moreCallsAllowed  (1),--B>--
+--<B--	userDeterminedUserBusy  (2)}--B>--
+
+CallBarringCause ::= ENUMERATED {
+	barringServiceActive  (0),
+	operatorBarring  (1)}
+
+CUG-RejectCauseNU1 calledPartySS-InteractionViolation must not be used in version 1
+
+SS-IncompatibilityCause ::= SEQUENCE {
+	ss-Code		[1] SS-Code	OPTIONAL,
+	basicService	BasicServiceCode	OPTIONAL,
+	ss-Status	[4] SS-Status	OPTIONAL}
+
+PW-RegistrationFailureCause ::= ENUMERATED {
+	undetermined  (0),
+	invalidFormat  (1),
+	newPasswordsMismatch  (2)}
+
+SM-DeliveryFailureCause ::= ENUMERATED {
+	memoryCapacityExceeded  (0),
+	equipmentProtocolError  (1),
+	equipmentNotSM-Equiped  (2),
+	unknownServiceCentre  (3),
+	sc-Congestion  (4),
+	invalidSME-Address  (5),
+	subscriberNotSC-Subscriber  (6)} 
+
+
+--- MODULE 'MAP-CommonDataTypes' START ---
+MAP-CommonDataTypes {
+   ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
+   moduleId (3) map-CommonDataTypes (18) version2 (2)}
+
+DEFINITIONS
+
+IMPLICIT TAGS
+
+::=
+
+BEGIN
+
+EXPORTS
+
+	-- general data types and values
+	TBCD-STRING,
+	AddressString,
+	ISDN-AddressString,
+	ISDN-SubaddressString,
+	ExternalSignalInfo,
+	SignalInfo,
+	maxSignalInfoLength,
+
+	-- data types for numbering and identification
+	IMSI,
+	TMSI,
+	SubscriberId,
+	IMEI,
+--<B----B>--
+--<B--	LocAreaIdOrNone,--B>--
+	LocationInfo,
+	HLR-List,
+	LMSI,
+	GlobalCellId,
+	NetworkResource,
+
+	-- data types for subscriber management
+	Category,
+	BearerServiceList,
+	TeleserviceList,
+	BasicServiceCode,
+	BasicServiceList,
+	BasicServiceGroupList,
+	maxNumOfBasicServiceGroups
+;
+
+IMPORTS
+	TeleserviceCode
+FROM MAP-TS-Code {
+   ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
+   moduleId (3) map-TS-Code (19) version2 (2)}
+
+	BearerServiceCode
+FROM MAP-BS-Code {
+   ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
+   moduleId (3) map-BS-Code (20) version2 (2)}
+;
+
+
+-- general data types
+
+TBCD-STRING ::= OCTET STRING
+	-- This type (Telephony Binary Coded Decimal String) is used to represent
+	-- several digits from 0 through 9, *, #, a, b , c, two digits per octet,
+	-- each digit encoded 0000 to 1001 (0 to 9), 1010 (*), 1011 (#), 1100 (a),
+	-- 1101 (b) or 1110 (c); 1111 used as filler when there is an odd number
+	-- of digits.
+
+	-- bits 8765 of octet n encoding digit 2n  
+	-- bits 4321 of octet n encoding digit 2(n-1) +1 
+
+AddressString ::= OCTET STRING (SIZE (1..maxAddressLength))
+	-- This type is used to represent a number for addressing purposes. It is
+	-- composed of
+	--	  a)	one  octet for nature of address, and numbering plan indicator.
+	--	  b)	digits of an address encoded as TBCD-String.
+
+	-- a)	The first octet includes a one bit extension indicator, a 3 bits nature of
+	-- 	address indicator and a 4 bits numbering plan indicator, encoded as
+	-- 	follows:
+
+	-- bit 8: 1  (no extension)
+
+	-- bits 765: nature of address indicator
+	--	000  unknown
+	--	001  international number
+	--	010  national significant number
+	--	011  network specific number
+	--	100  subscriber number
+	--	101  reserved 
+	--	110  abbreviated number
+	--	111  reserved for extension
+
+	-- bits 4321: numbering plan indicator
+	--	0000  unknown
+	--	0001  ISDN/Telephony Numbering Plan (Rec CCITT E.164)
+	--	0010  spare
+	--	0011  data numbering plan (Rec CCITT X.121)
+	--	0100  telex numbering plan (Rec CCITT F.69)
+	--	0101  spare
+	--	0110  land mobile numbering plan (REC CCITT E.212)
+	--	0111  spare
+	--	1000  national numbering plan
+	--	1001  private numbering plan
+	--	1111  reserved for extension
+
+	-- 	all other values are reserved.
+
+	-- b)	The following octets representing digits of an address encoded as a
+	--	TBCD-STRING.
+
+maxAddressLength  INTEGER ::= 20
+
+ISDN-AddressString ::= AddressString (SIZE (1..maxISDN-AddressLength))
+	-- This type is used to represent ISDN numbers.
+
+maxISDN-AddressLengthISDN-SubaddressString ::= OCTET STRING (SIZE (1..maxISDN-SubaddressLength))
+	-- This type is used to represent ISDN subaddresses.
+
+maxISDN-SubaddressLength  INTEGER ::= 21
+
+ExternalSignalInfo ::= SEQUENCE {
+	protocolId	ProtocolId,
+	signalInfo	SignalInfo}
+	-- This data type is defined to allow the Mobile Application Part protocol to
+	-- carry information elements defined in other Recommendations/Technical
+	-- Specifications without any direct reference to their internal
+	-- structure.
+
+	-- The data type represents any set of information elements (including tag
+	-- and length octets) imported from another signalling protocol. For the
+	-- user-network protocol, the set of elements may consist of a complete
+	-- layer 3 message. The protocol to which the information elements belong is
+	-- indicated by the protocolId element, while the signalling information is
+	-- contained in the signalInfo element.
+
+SignalInfo ::= OCTET STRING (SIZE (1..maxSignalInfoLength))
+
+maxSignalInfoLength  INTEGER ::= 200
+	-- This NamedValue represents the theoretical maximum number of octets
+	-- which are available to carry a single data type, without requiring
+	-- segmentation to cope with the network layer service. However, the actual
+	-- maximum size available for a data type may be lower, especially when
+	-- other information elements have to be included in the same component.
+
+ProtocolId ::= ENUMERATED {
+	gsm-0408  (1),
+	gsm-0806-DTAP  (2),
+	gsm-0808-BSSMAP  (3),
+	isup-Q763  (4)}
+
+
+-- data types for numbering and identification
+
+IMSI ::= TBCD-STRING (SIZE (3..8))
+	-- digits of MCC, MNC, MSIN are concatenated in this order.
+
+TMSI ::= OCTET STRING (SIZE (1..4))
+
+ ::= CHOICE {
+	imsi			[0] IMSI,
+	tmsi			[1] TMSI}
+
+IMEI ::= TBCD-STRING (SIZE (8))
+	-- The internal Structure is defined as follows:
+	--	type approval code: 6 digits
+	--	manufacturer place: 2 digits 
+	--	individual serial number: 6 digits
+	--	unassigned: 1 digit
+
+--<B--LocAreaId ::= OCTET STRING (SIZE (2..5))--B>--
+	-- Octets are coded according to GSM 04.08.
+	-- The internal structure is defined as follows:
+	--	Mobile Country Code:	3 digits according to Rec E.212
+	--			1 digit filler (1111)
+	--	Mobile Network Code:	2 digits according to Rec E.212
+	--	Location Area Code:	2 octets according to GSM 04.08
+
+--<B--LocAreaIdOrNone ::= CHOICE {--B>--
+--<B----B>--
+--<B--	noLocAreaId	NULL}--B>--
+
+LocationInfo ::= CHOICE {
+	roamingNumber	[0] ISDN-AddressString,
+	-- NU>1 roamingNumber must not be used in version greater 1
+	msc-Number	[1] ISDN-AddressString}
+
+HLR-Id ::= IMSI
+	-- leading digits of IMSI
+
+HLR-List ::= SEQUENCE SIZE (1..maxNumOfHLRId) OF
+				HLR-Id
+
+maxNumOfHLR-Id  INTEGER ::= 50
+
+LMSI ::= OCTET STRING (SIZE (4))
+
+GlobalCellId ::= OCTET STRING (SIZE (5..7))
+	-- Octets are coded according to GSM 04.08.
+	-- The internal structure is defined as follows:
+	--	Mobile Country Code:	3 digits according to Rec E.212
+	--			1 digit filler (1111)
+	--	Mobile Network Code:	2 digits according to Rec E.212
+	--	Location Area Code:	2 octets according to GSM 04.08
+	--	Cell Identity:	2 octets (CI) according to GSM 04.08
+
+NetworkResource ::= ENUMERATED {
+	plmn  (0),
+	hlr  (1),
+	vlr  (2),
+	pvlr  (3),
+	controllingMSC  (4),
+	vmsc  (5),
+	eir  (6),
+	rss  (7)}
+
+
+-- data types for subscriber management
+
+Category ::= OCTET STRING (SIZE (1))
+	-- The internal structure is defined in CCITT Rec Q.763.
+
+BearerServiceList ::= SEQUENCE SIZE (1..maxNumOfBearerServices) OF
+				BearerServiceCode
+
+maxNumOfBearerServicesTeleserviceList ::= SEQUENCE SIZE (1..maxNumOfTeleservices) OF
+				TeleserviceCode
+
+maxNumOfTeleservices  INTEGER ::= 20
+
+BasicServiceCode ::= CHOICE {
+	bearerService	[2] BearerServiceCode,
+	teleservice	[3] TeleserviceCode}
+
+BasicServiceList ::= SEQUENCE SIZE (1..maxNumOfBasicServices) OF
+				BasicServiceCode
+
+maxNumOfBasicServices  INTEGER ::= 70
+
+BasicServiceGroupList ::= SEQUENCE SIZE (1..maxNumOfBasicServiceGroups) OF
+				BasicServiceCode
+
+maxNumOfBasicServiceGroups  INTEGER ::= 13
+
+
+--- MODULE 'MAP-TS-Code' START ---
+MAP-TS-Code {
+   ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
+   moduleId (3) map-TS-Code (19) version2 (2)}
+
+DEFINITIONS
+
+::=
+
+BEGIN
+
+TeleserviceCode ::= OCTET STRING (SIZE (1))
+	-- This type is used to represent the code identifying a single teleservice, a
+	-- group of teleservices, or all teleservices. The services are defined in
+	-- GSM 02.03.
+	-- The internal structure is defined as follows:
+
+	-- bits 87654321: group (bits 8765) and specific service (bits 4321)
+
+allTeleservices	TeleserviceCode ::= '00000000'B
+
+allSpeechTransmissionServices	TeleserviceCode ::= '00010000'B
+telephony		TeleserviceCode ::= '00010001'B
+emergencyCalls	TeleserviceCode ::= '00010010'B
+
+allShortMessageServices	TeleserviceCode ::= '00100000'B
+shortMessageMT-PPshortMessageMO-PP	TeleserviceCode ::= '00100010'B 
+
+
+allTeletextTransmissionServices	TeleserviceCode ::= '01010000'B
+teletex			TeleserviceCode ::= '01010001'B
+teletexISDN		TeleserviceCode ::= '01010010'B
+-- NU1 teletexISDN must not be used in version 1
+
+allFacsimileTransmissionServices	TeleserviceCode ::= '01100000'B
+facsimileGroup3AndAlterSpeech	TeleserviceCode ::= '01100001'B
+automaticFacsimileGroup3	TeleserviceCode ::= '01100010'B
+	TeleserviceCode ::= '01100011'B
+-- NU1 facsimileGroup4 must not be used in version 1
+
+allPLMN-specificTS	TeleserviceCode ::= '11010000'B
+-- NU1 *plmn-specific* must not be used in version 1
+plmn-specificTS-1	TeleserviceCode ::= '11010001'B
+plmn-specificTS-2	TeleserviceCode ::= '11010010'B
+plmn-specificTS-3	TeleserviceCode ::= '11010011'B
+plmn-specificTS-4	TeleserviceCode ::= '11010100'B
+	TeleserviceCode ::= '11010101'B
+plmn-specificTS-6	TeleserviceCode ::= '11010110'B
+plmn-specificTS-7	TeleserviceCode ::= '11010111'B
+plmn-specificTS-8	TeleserviceCode ::= '11011000'B
+plmn-specificTS-9	TeleserviceCode ::= '11011001'B
+plmn-specificTS-A	TeleserviceCode ::= '11011010'B
+plmn-specificTS-B	TeleserviceCode ::= '11011011'B
+plmn-specificTS-C	TeleserviceCode ::= '11011100'B
+plmn-specificTS-Dplmn-specificTS-E	TeleserviceCode ::= '11011110'B
+plmn-specificTS-F	TeleserviceCode ::= '11011111'B
+
+
+--- MODULE 'MAP-BS-Code' START ---
+MAP-BS-Code {
+   ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
+   moduleId (3) map-BS-Code (20) version2 (2)}
+
+DEFINITIONS
+
+::=
+
+BEGIN
+
+BearerServiceCode ::= OCTET STRING (SIZE (1))
+	-- This type is used to represent the code identifying a single bearer service,
+	-- a group of bearer services, or all bearer services. The services are
+	-- defined in GSM 02.02.
+	-- The internal structure is defined as follows:
+
+	-- v1: bit 8: Transparency indicator (If applicable)
+	--	0  transparent (postfix T) or if not applicable (no postfix T or NT)
+	--	1  non transparent (postfix NT)
+
+	-- v2:
+	-- plmn-specific bearer services:
+	-- bits 87654321: defined by the HPLMN operator
+	-- rest of bearer services:
+	-- bit 8: 0 (unused)
+
+	-- bits 7654321: group (bits 7654), and rate, if applicable (bits 321)
+	-- symbolic constants are assigned only for v2
+
+allBearerServices	BearerServiceCode ::= '00000000'B
+
+allDataCDA-Services	BearerServiceCode ::= '00010000'B
+	BearerServiceCode ::= '00010001'B
+dataCDA-1200bps	BearerServiceCode ::= '00010010'B
+dataCDA-1200-75bps	BearerServiceCode ::= '00010011'B
+dataCDA-2400bps	BearerServiceCode ::= '00010100'B
+dataCDA-4800bps	BearerServiceCode ::= '00010101'B
+dataCDA-9600bps	BearerServiceCode ::= '00010110'B
+
+allDataCDS-Services	BearerServiceCode ::= '00011000'B
+dataCDS-1200bps	BearerServiceCode ::= '00011010'B
+dataCDS-2400bpsdataCDS-4800bps	BearerServiceCode ::= '00011101'B
+dataCDS-9600bps		BearerServiceCode ::= '00011110'B
+
+allPadAccessCA-Services	BearerServiceCode ::= '00100000'B
+padAccessCA-300bps	BearerServiceCode ::= '00100001'B
+padAccessCA-1200bps	BearerServiceCode ::= '00100010'B
+padAccessCA-1200-75bps	BearerServiceCode ::= '00100011'B
+padAccessCA-2400bps	BearerServiceCode ::= '00100100'B
+padAccessCA-4800bps	BearerServiceCode ::= '00100101'B
+	BearerServiceCode ::= '00100110'B
+
+allDataPDS-Services	BearerServiceCode ::= '00101000'B
+dataPDS-2400bps	BearerServiceCode ::= '00101100'B
+dataPDS-4800bps	BearerServiceCode ::= '00101101'B
+dataPDS-9600bps	BearerServiceCode ::= '00101110'B
+
+allAlternateSpeech-DataCDA	BearerServiceCode ::= '00110000'B
+
+allAlternateSpeech-DataCDS	BearerServiceCode ::= '00111000'B
+
+allSpeechFollowedByDataCDA	BearerServiceCode ::= '01000000'B
+
+allSpeechFollowedByDataCDSallUnrestrictedDigital-12-kbps	BearerServiceCode ::= '01111000'B
+
+allPLMN-specificBS	BearerServiceCode ::= '11010000'B
+-- NU1 *plmn-specific* must not be used in version 1
+plmn-specificBS-1	BearerServiceCode ::= '11010001'B
+plmn-specificBS-2	BearerServiceCode ::= '11010010'B
+plmn-specificBS-3	BearerServiceCode ::= '11010011'B
+plmn-specificBS-4	BearerServiceCode ::= '11010100'B
+plmn-specificBS-5	BearerServiceCode ::= '11010101'B
+	BearerServiceCode ::= '11010110'B
+plmn-specificBS-7	BearerServiceCode ::= '11010111'B
+plmn-specificBS-8	BearerServiceCode ::= '11011000'B
+plmn-specificBS-9	BearerServiceCode ::= '11011001'B
+plmn-specificBS-A	BearerServiceCode ::= '11011010'B
+plmn-specificBS-B	BearerServiceCode ::= '11011011'B
+plmn-specificBS-C	BearerServiceCode ::= '11011100'B
+plmn-specificBS-D	BearerServiceCode ::= '11011101'B
+plmn-specificBS-Eplmn-specificBS-F	BearerServiceCode ::= '11011111'B
+