diff --git a/asn1/MAP-SM-DataTypes.asn b/asn1/MAP-SM-DataTypes.asn
index 664baa1..cce532f 100644
--- a/asn1/MAP-SM-DataTypes.asn
+++ b/asn1/MAP-SM-DataTypes.asn
@@ -1,6 +1,10 @@
+-- $Id: MAP-SM-DataTypes.asn 35843 2011-02-07 17:44:34Z etxrab $
+-- 3GPP TS 29.002  V9.3.0 (2010-09)  
+-- 17.7.6	Short message data types
+
 MAP-SM-DataTypes {
    itu-t identified-organization (4) etsi (0) mobileDomain (0)
-   gsm-Network (1) modules (3) map-SM-DataTypes (16) version9 (9)}
+   gsm-Network (1) modules (3) map-SM-DataTypes (16) version12 (12)}
 
 DEFINITIONS
 
@@ -25,7 +29,9 @@
 	ReadyForSM-Res,
 	SM-DeliveryOutcome,
 	AlertReason,
-	Additional-Number
+	Additional-Number,
+	MT-ForwardSM-VGCS-Arg,
+	MT-ForwardSM-VGCS-Res
 ;
 
 IMPORTS
@@ -33,20 +39,22 @@
 	ISDN-AddressString,
 	SignalInfo,
 	IMSI,
-	LMSI
+	LMSI,
+	ASCI-CallReference
+
 FROM MAP-CommonDataTypes {
    itu-t identified-organization (4) etsi (0) mobileDomain (0)
-   gsm-Network (1) modules (3) map-CommonDataTypes (18) version9 (9)}
+   gsm-Network (1) modules (3) map-CommonDataTypes (18) version12 (12)}
 
 	AbsentSubscriberDiagnosticSM
 FROM MAP-ER-DataTypes {
    itu-t identified-organization (4) etsi (0) mobileDomain (0)
-   gsm-Network (1) modules (3) map-ER-DataTypes (17) version9 (9)}
+   gsm-Network (1) modules (3) map-ER-DataTypes (17) version12 (12)}
 
 	ExtensionContainer
 FROM MAP-ExtensionDataTypes {
    itu-t identified-organization (4) etsi (0) mobileDomain (0)
-   gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version9 (9)}
+   gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version12 (12)}
 ;
 
 
@@ -60,7 +68,13 @@
 	-- gprsSupportIndicator is set only if the SMS-GMSC supports
 	-- receiving of two numbers from the HLR
 	sm-RP-MTI		[8] SM-RP-MTI	OPTIONAL,
-	sm-RP-SMEA	[9] SM-RP-SMEA	OPTIONAL }
+	sm-RP-SMEA	[9] SM-RP-SMEA	OPTIONAL,
+	sm-deliveryNotIntended	[10] SM-DeliveryNotIntended	OPTIONAL }
+
+SM-DeliveryNotIntended ::= ENUMERATED {
+	onlyIMSI-requested  (0),
+	onlyMCC-MNC-requested  (1),
+	...}
 
 SM-RP-MTI ::= INTEGER (0..10)
 	-- 0 SMS Deliver 
@@ -78,6 +92,9 @@
 RoutingInfoForSM-Res ::= SEQUENCE {
 	imsi			IMSI,
 	locationInfoWithLMSI	[0] LocationInfoWithLMSI,
+-- WS extension to handle old versions
+	mwd-Set [2] BOOLEAN OPTIONAL,	
+	-- mwd-Set must be absent in version greater 1
 	extensionContainer	[4] ExtensionContainer	OPTIONAL,
 	...}
 
@@ -90,7 +107,8 @@
 	-- gprsNodeIndicator is set only if the SGSN number is sent as the 
 	-- Network Node Number
 	additional-Number	[6] Additional-Number	OPTIONAL 
-	-- NetworkNode-number can be either msc-number or sgsn-number
+	-- NetworkNode-number can be either msc-number or sgsn-number or IP-SM-GW
+	-- number or SMS Router number
 	}
 
 Additional-Number ::= CHOICE {
@@ -156,10 +174,21 @@
 	additionalSM-DeliveryOutcome	[4] 	SM-DeliveryOutcome 	OPTIONAL,
 	-- If received, additionalSM-DeliveryOutcome is for GPRS
 	-- If DeliveryOutcomeIndicator is set, then AdditionalSM-DeliveryOutcome shall be absent
-	additionalAbsentSubscriberDiagnosticSM	[5] 	AbsentSubscriberDiagnosticSM OPTIONAL
+	additionalAbsentSubscriberDiagnosticSM	[5] 	AbsentSubscriberDiagnosticSM OPTIONAL,
 	-- If received additionalAbsentSubscriberDiagnosticSM is for GPRS
 	-- If DeliveryOutcomeIndicator is set, then AdditionalAbsentSubscriberDiagnosticSM 
 	-- shall be absent
+	ip-sm-gw-Indicator	[6] 	NULL		OPTIONAL,
+	-- the ip-sm-gw indicator indicates by its presence that sm-deliveryOutcome
+	-- is for delivery via IMS
+	-- If present, deliveryOutcomeIndicator shall be absent.
+	ip-sm-gw-sm-deliveryOutcome	[7] 	SM-DeliveryOutcome	OPTIONAL, 
+	-- If received ip-sm-gw-sm-deliveryOutcome is for delivery via IMS
+	-- If ip-sm-gw-Indicator is set, then ip-sm-gw-sm-deliveryOutcome shall be absent
+	ip-sm-gw-absentSubscriberDiagnosticSM	[8]	AbsentSubscriberDiagnosticSM	OPTIONAL
+	-- If received ip-sm-gw-sm-absentSubscriberDiagnosticSM is for delivery via IMS
+	-- If ip-sm-gw-Indicator is set, then ip-sm-gw-sm-absentSubscriberDiagnosticSM 
+	-- shall be absent
 	}
 
 SM-DeliveryOutcome ::= ENUMERATED {
@@ -204,7 +233,11 @@
 	-- alertReasonIndicator is set only when the alertReason 
 	-- sent to HLR is for GPRS
 	extensionContainer	ExtensionContainer	OPTIONAL,
-	...}
+	...,
+	additionalAlertReasonIndicator	[1] NULL		OPTIONAL
+	-- additionalAlertReasonIndicator is set only when the alertReason
+	-- sent to HLR is for IP-SM-GW
+	}
 
 ReadyForSM-Res ::= SEQUENCE {
 	extensionContainer	ExtensionContainer	OPTIONAL,
@@ -214,4 +247,26 @@
 	ms-Present  (0),
 	memoryAvailable  (1)}
 
+MT-ForwardSM-VGCS-Arg ::= SEQUENCE {
+	asciCallReference	ASCI-CallReference,
+	sm-RP-OA		SM-RP-OA,
+	sm-RP-UI		SignalInfo,
+	extensionContainer	ExtensionContainer	OPTIONAL,
+	...}
+
+MT-ForwardSM-VGCS-Res ::= SEQUENCE {
+	sm-RP-UI		[0] SignalInfo	OPTIONAL,
+	dispatcherList	[1] DispatcherList	OPTIONAL,
+	ongoingCall	NULL			OPTIONAL,
+	extensionContainer	[2] ExtensionContainer	OPTIONAL,
+	...}
+
+DispatcherList ::= 
+	SEQUENCE SIZE (1..maxNumOfDispatchers) OF
+				ISDN-AddressString
+
+maxNumOfDispatchers  INTEGER ::= 5
+
+
+
 END