cap: Add phase2 messages and ACNs..

The strategy is to use the specific bound parameter when it is
necessary. Sequences are copied from the Rel98 specification. I
checked most types by hand if they are compatible between V2 and
V3/V4. This approach is obviously error prone..

6 files changed, 605 insertions, 3 deletions

diff --git a/camel/CAP-datatypes.asn b/camel/CAP-datatypes.asn
index 90469dc..4a9ed51 100644
--- a/camel/CAP-datatypes.asn
+++ b/camel/CAP-datatypes.asn
@@ -174,6 +174,13 @@ BCSMEventV1							::= SEQUENCE {
 	legID							[2] LegID							OPTIONAL
 	}
 
+BCSMEventV2							::= SEQUENCE {
+	eventTypeBCSM						[0] EventTypeBCSM,
+	monitorMode							[1] MonitorMode,
+	legID								[2] LegID								OPTIONAL,
+	dpSpecificCriteria					[30] DpSpecificCriteriaV2					OPTIONAL
+	}
+
 BCSMEvent{PARAMETERS-BOUND : bound} ::= SEQUENCE {
 	eventTypeBCSM						[0] EventTypeBCSM,
 	monitorMode							[1] MonitorMode,
@@ -567,6 +574,10 @@ Digits {PARAMETERS-BOUND : bound} ::= OCTET STRING (SIZE(
 -- Note that when CorrelationID is transported in Generic Digits, then the digits shall
 -- always be BCD encoded.
 
+DpSpecificCriteriaV2					::= CHOICE {
+	applicationTimer					[1] ApplicationTimer
+	}
+
 DpSpecificCriteria {PARAMETERS-BOUND : bound}::= CHOICE {
 	applicationTimer					[1] ApplicationTimer,
 	midCallControlInfo					[2]	MidCallControlInfo, 
@@ -1192,12 +1203,43 @@ MT-SMSCause ::= OCTET STRING (SIZE (1))
 -- or time-out from the MS, then MT-SMSCause shall be set to 'Protocol error,
 -- unspecified', as defined in 3GPP TS 24.011 [10].
 
+NACarrierInformation				::= SEQUENCE { 
+		naCarrierId						[0] NAEA-CIC								OPTIONAL,
+		naCICSelectionType				[1] NACarrierSelectionInfo					OPTIONAL,
+		...}
+
+NACarrierSelectionInfo				::= OCTET STRING (SIZE (1))
+--  NA carrier selection information octet carries the same values as ANSI
+--  ISUP T1.113:		'00'H - not indicated or not explicitly provided
+--						'01'H - subscribed not dialed
+--						'02'H - subscribed and dialed
+--						'03'H - subscribed with dialing undetermined
+--						'04'H - dialed CIC not subscribed
+
 NAOliInfo ::= OCTET STRING (SIZE (1))
 --  NA Oli information takes the same value as defined in ANSI T1.113-1995 [92]
 --  e.g.	'3D'H  – Decimal value 61 - Cellular Service (Type 1)
 --			'3E'H  – Decimal value 62 - Cellular Service (Type 2)
 --			'3F'H  – Decimal value 63 - Cellular Service (roaming)
 
+NAChargeNumber						::= OCTET STRING (SIZE (2..7))
+--  This parameter uniquely identifies the chargeable number for a call sent into a North American
+-- long distance carrier. It transports the ChargeNumber Parameter Field
+--  as defined in ANSI ISUP T1.113. This provides
+--  - 1 octet for the nature of address indicator field, plus
+--  - 1 octet for a numbering plan field, plus
+--  - up to 5 octets for the address signal (up to 10 digits)
+
+--	The Charge Number in ANSI T1.113 normally contains a 10 digit national number within the North
+--	American Numbering Plan (NANP); longer (e.g. international) charge numbers are not supported in
+--	T1.113
+
+NA-Info							::= SEQUENCE {
+	naCarrierInformation				[0] NACarrierInformation				OPTIONAL,
+	naOliInfo							[1] NAOliInfo							OPTIONAL,
+	naChargeNumber						[2] NAChargeNumber						OPTIONAL,
+	...}
+
 NatureOfServiceChange ::= ENUMERATED {
 	userInitiated						(0),
 	networkInitiated					(1)
diff --git a/camel/CAP-gsmSCF-gsmSRF-ops-args.asn b/camel/CAP-gsmSCF-gsmSRF-ops-args.asn
index f524ac0..0382d8d 100644
--- a/camel/CAP-gsmSCF-gsmSRF-ops-args.asn
+++ b/camel/CAP-gsmSCF-gsmSRF-ops-args.asn
@@ -63,6 +63,19 @@ umts-network(1) modules(3) cap-object-identifiers(100) version8(7)}
 
 ;
 
+playAnnouncementV2 OPERATION ::= {
+	ARGUMENT		PlayAnnouncementArgV2
+	RETURN RESULT	FALSE
+	ERRORS			{canceled |
+					missingParameter |
+					systemFailure |
+					unavailableResource |
+					unexpectedComponentSequence |
+					unexpectedDataValue |
+					unexpectedParameter}
+	LINKED			{specializedResourceReportV2}
+	CODE			opcode-playAnnouncement}
+
 playAnnouncement {PARAMETERS-BOUND : bound} OPERATION ::= {
 	ARGUMENT		PlayAnnouncementArg {bound}
 	RETURN RESULT	FALSE
@@ -88,6 +101,15 @@ playAnnouncement {PARAMETERS-BOUND : bound} OPERATION ::= {
 -- Any error is returned to the gsmSCF. The timer associated with this operation must
 -- be of a sufficient duration to allow its linked operation to be correctly correlated.
 
+PlayAnnouncementArgV2 				::= SEQUENCE {
+	informationToSend					[0] InformationToSend {cAPSpecificBoundSet},
+	disconnectFromIPForbidden			[1] BOOLEAN								DEFAULT TRUE,
+	requestAnnouncementComplete			[2] BOOLEAN								DEFAULT TRUE,
+	extensions							[3] SEQUENCE SIZE(1..numOfExtensionsV1) 	OF
+														ExtensionField			OPTIONAL,
+  	...
+	}
+
 PlayAnnouncementArg {PARAMETERS-BOUND : bound}::= SEQUENCE {
 	informationToSend					[0] InformationToSend {bound},
 	disconnectFromIPForbidden			[1] BOOLEAN DEFAULT TRUE,
@@ -98,6 +120,21 @@ PlayAnnouncementArg {PARAMETERS-BOUND : bound}::= SEQUENCE {
 	...
 	}
 
+promptAndCollectUserInformationV2 OPERATION ::= {
+	ARGUMENT		PromptAndCollectUserInformationArgV2
+	RESULT			ReceivedInformationArgV2
+	ERRORS			{canceled |
+					improperCallerResponse |
+					missingParameter |
+					systemFailure |
+					taskRefused |
+					unavailableResource |
+					unexpectedComponentSequence |
+					unexpectedDataValue |
+					unexpectedParameter}
+	LINKED			{specializedResourceReportV2}
+	CODE			opcode-promptAndCollectUserInformation}
+
 promptAndCollectUserInformation {PARAMETERS-BOUND : bound} OPERATION ::= {
 	ARGUMENT		PromptAndCollectUserInformationArg {bound}
 	RESULT			ReceivedInformationArg {bound}
@@ -117,7 +154,16 @@ promptAndCollectUserInformation {PARAMETERS-BOUND : bound} OPERATION ::= {
 -- Direction: gsmSCF -> gsmSRF, Timer: Tpc 
 -- This operation is used to interact with a user to collect information.
 
-PromptAndCollectUserInformationArg {PARAMETERS-BOUND : bound}::= SEQUENCE {
+PromptAndCollectUserInformationArgV2	::= SEQUENCE {
+	collectedInfo						[0] CollectedInfo,
+	disconnectFromIPForbidden			[1] BOOLEAN								DEFAULT TRUE,
+	informationToSend 					[2] InformationToSend {cAPSpecificBoundSet}					OPTIONAL,
+	extensions							[3] SEQUENCE SIZE(1..numOfExtensionsV1)	OF
+														ExtensionField 			OPTIONAL,
+  	...
+	}
+
+PromptAndCollectUserInformationArg {PARAMETERS-BOUND : bound} ::= SEQUENCE {
 	collectedInfo						[0] CollectedInfo,
 	disconnectFromIPForbidden			[1] BOOLEAN	DEFAULT TRUE,
 	informationToSend					[2] InformationToSend {bound}				OPTIONAL,
@@ -127,10 +173,21 @@ PromptAndCollectUserInformationArg {PARAMETERS-BOUND : bound}::= SEQUENCE {
 	...
 	}
 
+
+ReceivedInformationArgV2 				::= CHOICE {
+	digitsResponse						[0] Digits {cAPSpecificBoundSet}
+	}
+
 ReceivedInformationArg {PARAMETERS-BOUND : bound}::= CHOICE {
 	digitsResponse						[0] Digits {bound}
 	}
 
+specializedResourceReportV2 OPERATION ::= {
+	ARGUMENT		SpecializedResourceReportArgV2
+	RETURN RESULT	FALSE
+	ALWAYS RESPONDS	FALSE
+	CODE			opcode-specializedResourceReport}
+
 specializedResourceReport OPERATION ::= {
 	ARGUMENT		SpecializedResourceReportArg
 	RETURN RESULT	FALSE
@@ -140,6 +197,8 @@ specializedResourceReport OPERATION ::= {
 -- This operation is used as the response to a PlayAnnouncement operation when the announcement 
 -- completed report indication is set.
 
+SpecializedResourceReportArgV2 		::=  NULL
+
 SpecializedResourceReportArg ::= CHOICE {
 	allAnnouncementsComplete			[50] NULL,
 	firstAnnouncementStarted			[51] NULL
diff --git a/camel/CAP-gsmSCF-gsmSRF-pkgs-contracts-acs.asn b/camel/CAP-gsmSCF-gsmSRF-pkgs-contracts-acs.asn
index dd5cc3f..9ae12d7 100644
--- a/camel/CAP-gsmSCF-gsmSRF-pkgs-contracts-acs.asn
+++ b/camel/CAP-gsmSCF-gsmSRF-pkgs-contracts-acs.asn
@@ -32,8 +32,11 @@ FROM TCAPMessages tc-Messages
 FROM TC-Notation-Extensions tc-NotationExtensions
 
 	playAnnouncement {},
+	playAnnouncementV2,
 	promptAndCollectUserInformation {},
-	specializedResourceReport
+	promptAndCollectUserInformationV2,
+	specializedResourceReport,
+	specializedResourceReportV2
 FROM CAP-gsmSCF-gsmSRF-ops-args gsmSCF-gsmSRF-Operations-- Object Identifier 'gsmSCF-gsmSRF-Operations' is updated to version8(7) in Rel-6. As
 -- a result, the present module, 'CAP-gsmSCF-gsmSRF-pkgs-contracts-acs', IMPORTS CAP
 -- Operation definitions from CAP-gsmSCF-gsmSRF-ops-args version8(7). Operation
@@ -41,7 +44,9 @@ FROM CAP-gsmSCF-gsmSRF-ops-args gsmSCF-gsmSRF-Operations-- Object Identifier 'gs
 -- definitions.
 
 	activityTest,
+	activityTestV2,
 	cancel {},
+	cancelV2,
 	assistRequestInstructions {}
 FROM CAP-gsmSSF-gsmSCF-ops-args gsmSSF-gsmSCF-Operations
 -- Object Identifier 'gsmSSF-gsmSCF-Operations' is updated to version8(7) in Rel-6. AS
@@ -50,6 +55,7 @@ FROM CAP-gsmSSF-gsmSCF-ops-args gsmSSF-gsmSCF-Operations
 -- definitions are used in the ABSTRACT SYNTAX definitions and in the OPERATION PACKAGE
 -- definitions.
 
+	gsmSRF-scfActivationOfAssistPackageV2,
 	gsmSRF-scfActivationOfAssistPackage {}
 FROM CAP-gsmSSF-gsmSCF-pkgs-contracts-acs gsmSSF-gsmSCF-Protocol
 -- Object Identifier 'gsmSSF-gsmSCF-Protocol' is updated to version8(7) in Rel-6. As a
@@ -99,6 +105,14 @@ umts-network(1) modules(3) cap-object-identifiers(100) version8(7)};
 -- The structured DIALOGUE MODE is defined in ITU-T Recommendation Q.771; the
 -- dialogue-abstract-syntax ABSTRACT SYNTAX is defined in ITU-T Recommendation Q.775.
 
+gsmSRF-gsmSCF-acV2 APPLICATION-CONTEXT ::= {
+	CONTRACT					gsmSRF-gsmSCF-contractV2
+	DIALOGUE MODE				structured
+	TERMINATION					basic
+	ABSTRACT SYNTAXES			{dialogue-abstract-syntax |
+								gsmSRF-gsmSCF-abstract-syntax}
+	APPLICATION CONTEXT NAME	id-ac-gsmSRF-gsmSCFV2}
+
 gsmSRF-gsmSCF-ac APPLICATION-CONTEXT ::= {
 	CONTRACT					gsmSRF-gsmSCF-contract
 	DIALOGUE MODE				structured
@@ -113,6 +127,13 @@ gsmSRF-gsmSCF-ac APPLICATION-CONTEXT ::= {
 -- The CONTRACT definitions are updated for Rel-6, due to the fact that the individual
 -- OPERATION-PACKAGE definitions are updated in Rel-6.
 
+gsmSRF-gsmSCF-contractV2 CONTRACT ::= {
+	INITIATOR CONSUMER OF		{gsmSRF-scfActivationOfAssistPackageV2}
+	RESPONDER CONSUMER OF		{specializedResourceControlPackageV2 |
+						gsmSRF-scfCancelPackageV2 |
+						activityTestPackageV2}
+}
+
 gsmSRF-gsmSCF-contract CONTRACT ::= {
 	INITIATOR CONSUMER OF		{gsmSRF-scfActivationOfAssistPackage {cAPSpecificBoundSet}}
 	RESPONDER CONSUMER OF		{specializedResourceControlPackage {cAPSpecificBoundSet} |
@@ -127,16 +148,29 @@ gsmSRF-gsmSCF-contract CONTRACT ::= {
 -- OPERATION definitions are updated in Rel-6. The OPERATION definitions are IMPORTED from
 -- CAP-gsmSSF-gsmSCF-ops-args and from CAP-gsmSCF-gsmSRF-ops-args.
 
+specializedResourceControlPackageV2 OPERATION-PACKAGE ::= {
+	CONSUMER INVOKES		{playAnnouncementV2 | promptAndCollectUserInformationV2}
+	SUPPLIER INVOKES		{specializedResourceReportV2}
+}
+
 specializedResourceControlPackage {PARAMETERS-BOUND : bound} OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{playAnnouncement {bound} |
 						promptAndCollectUserInformation {bound}}
 	SUPPLIER INVOKES	{specializedResourceReport}
 	ID					id-package-specializedResourceControl}
 
+gsmSRF-scfCancelPackageV2 OPERATION-PACKAGE ::= {
+	CONSUMER INVOKES	{cancelV2}
+}
+
 gsmSRF-scfCancelPackage {PARAMETERS-BOUND : bound} OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{cancel {bound}}
 	ID					id-package-gsmSRF-scfCancel}
 
+activityTestPackageV2 OPERATION-PACKAGE ::= {
+	CONSUMER INVOKES	{activityTestV2}
+}
+
 activityTestPackage OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{activityTest}
 	ID					id-package-activityTest}
diff --git a/camel/CAP-gsmSSF-gsmSCF-ops-args.asn b/camel/CAP-gsmSSF-gsmSCF-ops-args.asn
index 16cb718..002dd9b 100644
--- a/camel/CAP-gsmSSF-gsmSCF-ops-args.asn
+++ b/camel/CAP-gsmSSF-gsmSCF-ops-args.asn
@@ -141,6 +141,7 @@ FROM CAP-operationcodes operationcodes
 	LowLayerCompatibility {},
 	MonitorMode,
 	NAOliInfo,
+	NA-Info,
 	OCSIApplicable,
 	OriginalCalledPartyID {},
 	ReceivingSideID,
@@ -182,6 +183,10 @@ activityTestV1 OPERATION ::= {
 	RETURN RESULT	TRUE
 	CODE			opcode-activityTest}
 
+activityTestV2 OPERATION ::= {
+	RETURN RESULT	TRUE
+	CODE			opcode-activityTest}
+
 activityTest OPERATION ::= {
 	RETURN RESULT	TRUE
 	CODE			opcode-activityTest}
@@ -192,6 +197,19 @@ activityTest OPERATION ::= {
 -- then the gsmSCF will assume that the gsmSSF, assist gsmSSF or gsmSRF has failed
 -- in some way.
 
+applyChargingV2 OPERATION ::= {
+	ARGUMENT		ApplyChargingArgV2
+	RETURN RESULT		FALSE
+	ERRORS			{missingParameter |
+					unexpectedComponentSequence |
+					unexpectedParameter |
+					unexpectedDataValue |
+					parameterOutOfRange |
+					systemFailure |
+					taskRefused |
+					unknownLegID}
+	CODE			opcode-applyCharging}
+
 applyCharging {PARAMETERS-BOUND : bound} OPERATION ::= {
 	ARGUMENT		ApplyChargingArg {bound}
 	RETURN RESULT	FALSE
@@ -209,6 +227,15 @@ applyCharging {PARAMETERS-BOUND : bound} OPERATION ::= {
 -- This operation is used for interacting from the gsmSCF with the gsmSSF charging mechanisms.
 -- The ApplyChargingReport operation provides the feedback from the gsmSSF to the gsmSCF.
 
+ApplyChargingArgV2					::= SEQUENCE {
+	aChBillingChargingCharacteristics	[0] AChBillingChargingCharacteristics {cAPSpecificBoundSet},
+	partyToCharge						[2] SendingSideID						
+											DEFAULT sendingSideID : leg1,
+	extensions							[3] SEQUENCE SIZE(1..numOfExtensionsV1)	OF
+														ExtensionField			OPTIONAL,
+  	...
+	}
+
 ApplyChargingArg {PARAMETERS-BOUND : bound} ::= SEQUENCE {
 	aChBillingChargingCharacteristics	[0] AChBillingChargingCharacteristics {bound},
 	partyToCharge						[2] SendingSideID DEFAULT sendingSideID : leg1,
@@ -221,6 +248,19 @@ ApplyChargingArg {PARAMETERS-BOUND : bound} ::= SEQUENCE {
 -- The partyToCharge parameter indicates the party in the call to which the ApplyCharging operation
 -- shall be applied.
 
+applyChargingReportV2 OPERATION ::= {
+	ARGUMENT		ApplyChargingReportArgV2
+	RETURN RESULT	FALSE
+	ERRORS			{missingParameter |
+					unexpectedComponentSequence |
+					unexpectedParameter |
+					unexpectedDataValue |
+					parameterOutOfRange |
+					systemFailure |
+					taskRefused}
+	CODE			opcode-applyChargingReport}
+	
+
 applyChargingReport {PARAMETERS-BOUND : bound} OPERATION ::= {
 	ARGUMENT		ApplyChargingReportArg {bound}
 	RETURN RESULT	FALSE
@@ -238,8 +278,22 @@ applyChargingReport {PARAMETERS-BOUND : bound} OPERATION ::= {
 -- This operation is used by the gsmSSF to report to the gsmSCF the occurrence of a
 -- specific charging event as requested by the gsmSCF using the ApplyCharging operation.
 
+ApplyChargingReportArgV2 ::= CallResult {cAPSpecificBoundSet}
+
 ApplyChargingReportArg {PARAMETERS-BOUND : bound} ::= CallResult {bound}
 
+
+assistRequestInstructionsV2 OPERATION ::= {
+	ARGUMENT		AssistRequestInstructionsArgV2
+	RETURN RESULT	FALSE
+	ERRORS			{missingCustomerRecord |
+					missingParameter |
+					taskRefused |
+					unexpectedComponentSequence |
+					unexpectedDataValue |
+					unexpectedParameter}
+	CODE			opcode-assistRequestInstructions}
+
 assistRequestInstructions {PARAMETERS-BOUND : bound} OPERATION ::= {
 	ARGUMENT		AssistRequestInstructionsArg {bound}
 	RETURN RESULT	FALSE
@@ -260,6 +314,15 @@ assistRequestInstructions {PARAMETERS-BOUND : bound} OPERATION ::= {
 -- the gsmSCF.
 -- Refer to clause 11 for a description of the procedures associated with this operation.
 
+
+AssistRequestInstructionsArgV2		::= SEQUENCE {
+	correlationID						[0] CorrelationID {cAPSpecificBoundSet},
+	iPSSPCapabilities					[2] IPSSPCapabilities {cAPSpecificBoundSet},
+	extensions							[3] SEQUENCE SIZE(1..numOfExtensionsV1) 	OF 
+															ExtensionField 		OPTIONAL,
+  	...
+	}
+
 AssistRequestInstructionsArg {PARAMETERS-BOUND : bound} ::= SEQUENCE {
 	correlationID						[0] CorrelationID {bound},
 	iPSSPCapabilities					[2] IPSSPCapabilities {bound},
@@ -289,6 +352,12 @@ CallGapArg {PARAMETERS-BOUND : bound}::= SEQUENCE {
 -- OPTIONAL denotes network operator optional. If gapTreatment is not present, then the gsmSSF will
 -- use a default treatment depending on network operator implementation.
 
+callInformationReportV2 OPERATION ::= {
+	ARGUMENT		CallInformationReportArgV2
+	RETURN RESULT FALSE
+	ALWAYS RESPONDS	FALSE
+	CODE			opcode-callInformationReport}
+
 callInformationReport {PARAMETERS-BOUND : bound} OPERATION ::= {
 	ARGUMENT		CallInformationReportArg {bound}
 	RETURN RESULT	FALSE
@@ -298,6 +367,15 @@ callInformationReport {PARAMETERS-BOUND : bound} OPERATION ::= {
 -- This operation is used to send specific call information for a single call party to the gsmSCF as
 -- requested by the gsmSCF in a previous CallInformationRequest.
 
+
+CallInformationReportArgV2			::= SEQUENCE {
+	requestedInformationList			[0] RequestedInformationList {cAPSpecificBoundSet},
+	extensions							[2] SEQUENCE SIZE(1..numOfExtensionsV1)	OF
+															ExtensionField 		OPTIONAL,
+	legID								[3] ReceivingSideID						OPTIONAL,
+  	...
+	}
+
 CallInformationReportArg {PARAMETERS-BOUND : bound} ::= SEQUENCE {
 	requestedInformationList			[0] RequestedInformationList {bound},
 	extensions							[2] Extensions {bound}						OPTIONAL,
@@ -305,6 +383,20 @@ CallInformationReportArg {PARAMETERS-BOUND : bound} ::= SEQUENCE {
 	...
 	}
 
+callInformationRequestV2 OPERATION ::= {
+	ARGUMENT		CallInformationRequestArgV2
+	RETURN RESULT	FALSE
+	ERRORS			{missingParameter |
+					parameterOutOfRange |
+					requestedInfoError |
+					systemFailure |
+					taskRefused |
+					unexpectedComponentSequence |
+					unexpectedDataValue |
+					unexpectedParameter |
+					unknownLegID}
+}
+
 callInformationRequest {PARAMETERS-BOUND : bound} OPERATION ::= {
 	ARGUMENT		CallInformationRequestArg {bound}
 	RETURN RESULT	FALSE
@@ -322,6 +414,14 @@ callInformationRequest {PARAMETERS-BOUND : bound} OPERATION ::= {
 -- This operation is used to request the gsmSSF to record specific information about a single
 -- call party and report it to the gsmSCF (with a CallInformationReport operation).
 
+CallInformationRequestArgV2			::= SEQUENCE {
+	requestedInformationTypeList		[0] RequestedInformationTypeList,
+	extensions							[2] SEQUENCE SIZE(1..numOfExtensionsV1)	OF
+															ExtensionField		OPTIONAL,
+	legID								[3] SendingSideID						OPTIONAL,
+  	...
+	}
+
 CallInformationRequestArg {PARAMETERS-BOUND : bound}::= SEQUENCE {
 	requestedInformationTypeList		[0] RequestedInformationTypeList,
 	extensions							[2] Extensions {bound}						OPTIONAL,
@@ -330,6 +430,12 @@ CallInformationRequestArg {PARAMETERS-BOUND : bound}::= SEQUENCE {
 	}
 -- OPTIONAL denotes network operator optional.
 
+cancelV2 OPERATION ::= {
+	ARGUMENT		CancelArgV2
+	RETURN RESULT		FALSE
+	ERRORS			{cancelFailed}
+	CODE			opcode-cancel}
+
 cancel {PARAMETERS-BOUND : bound} OPERATION ::= {
 	ARGUMENT		CancelArg {bound}
 	RETURN RESULT	FALSE
@@ -342,6 +448,11 @@ cancel {PARAMETERS-BOUND : bound} OPERATION ::= {
 -- This operation cancels the correlated previous operation or all previous requests. The following
 -- operations can be canceled: PlayAnnouncement, PromptAndCollectUserInformation.
 
+CancelArgV2							::= CHOICE {
+	invokeID							[0] InvokeID,
+	allRequests							[1] NULL
+}
+
 CancelArg {PARAMETERS-BOUND : bound} ::= CHOICE {
 	invokeID							[0] InvokeID,
 	allRequests							[1] NULL,
@@ -382,6 +493,19 @@ connectV1 OPERATION ::= {
 	CODE			opcode-connect
 }
 
+connectV2 OPERATION ::= {
+	ARGUMENT		ConnectArgV2
+	RETURN RESULT	FALSE
+	ERRORS {
+		missingParameter |
+		systemFailure |
+		taskRefused |
+		unexpectedComponentSequence |
+		unexpectedDataValue |
+		unexpectedParameter}
+	CODE			opcode-connect
+}
+
 connect {PARAMETERS-BOUND : bound} OPERATION ::= {
 	ARGUMENT		ConnectArg {bound}
 	RETURN RESULT	FALSE
@@ -411,6 +535,23 @@ ConnectArgV1 ::= SEQUENCE {
 	...
 }
 
+ConnectArgV2							::= SEQUENCE {
+	destinationRoutingAddress			[0] DestinationRoutingAddress,
+	alertingPattern						[1] AlertingPattern						OPTIONAL,
+	originalCalledPartyID				[6] OriginalCalledPartyID				OPTIONAL,
+	extensions							[10] SEQUENCE SIZE(1..numOfExtensions) 	OF 
+															ExtensionField		OPTIONAL,
+	callingPartysCategory				[28] CallingPartysCategory				OPTIONAL,
+	redirectingPartyID					[29] RedirectingPartyID					OPTIONAL,
+	redirectionInformation				[30] RedirectionInformation				OPTIONAL,
+	genericNumbers						[14] GenericNumbers						OPTIONAL,
+	suppressionOfAnnouncement			[55] SuppressionOfAnnouncement			OPTIONAL,
+	oCSIApplicable						[56] OCSIApplicable						OPTIONAL,
+	...,
+	na-Info							[57] NA-Info							OPTIONAL
+	}
+--	na-Info is included at the discretion of the gsmSCF operator.
+
 ConnectArg {PARAMETERS-BOUND : bound} ::= SEQUENCE {
 	destinationRoutingAddress			[0] DestinationRoutingAddress {bound},
 	alertingPattern						[1] AlertingPattern							OPTIONAL,
@@ -435,6 +576,17 @@ ConnectArg {PARAMETERS-BOUND : bound} ::= SEQUENCE {
 	}
 -- na-Info is included at the discretion of the gsmSCF operator.
 
+connectToResourceV2 OPERATION ::= {
+	ARGUMENT		ConnectToResourceArgV2
+	RETURN RESULT	FALSE
+	ERRORS			{missingParameter |
+					systemFailure |
+					taskRefused |
+					unexpectedComponentSequence |
+					unexpectedDataValue |
+					unexpectedParameter}
+	CODE			opcode-connectToResource}
+
 connectToResource {PARAMETERS-BOUND : bound} OPERATION ::= {
 	ARGUMENT		ConnectToResourceArg {bound}
 	RETURN RESULT	FALSE
@@ -450,6 +602,17 @@ connectToResource {PARAMETERS-BOUND : bound} OPERATION ::= {
 -- This operation is used to connect a call segment from the gsmSSF to the
 -- gsmSRF.
 
+ConnectToResourceArgV2 				::= SEQUENCE {
+	resourceAddress						CHOICE {
+			ipRoutingAddress				[0]	IPRoutingAddress{cAPSpecificBoundSet},
+			none							[3]	NULL
+			},
+	extensions							[4] SEQUENCE SIZE(1..numOfExtensionsV1)	OF
+	  														ExtensionField		OPTIONAL,
+	serviceInteractionIndicatorsTwo		[7] ServiceInteractionIndicatorsTwo		OPTIONAL,
+  	...
+	}
+
 ConnectToResourceArg {PARAMETERS-BOUND : bound} ::= SEQUENCE {
 	resourceAddress	CHOICE {
 		ipRoutingAddress					[0] IPRoutingAddress {bound},
@@ -467,6 +630,12 @@ continueV1 OPERATION ::= {
 	CODE			opcode-continue
 }
 
+continueV2 OPERATION ::= {
+	RETURN RESULT	FALSE
+	ALWAYS RESPONDS	FALSE
+	CODE			opcode-continue
+}
+
 continue OPERATION ::= {
 	RETURN RESULT	FALSE
 	ALWAYS RESPONDS	FALSE
@@ -520,6 +689,13 @@ ContinueWithArgumentArgExtension {PARAMETERS-BOUND : bound} ::= SEQUENCE {
 	...
 	}
 
+disconnectForwardConnectionV2 OPERATION ::= {
+	RETURN RESULT	FALSE
+	ERRORS			{systemFailure |
+					taskRefused |
+					unexpectedComponentSequence}
+	CODE			opcode-disconnectForwardConnection}
+
 disconnectForwardConnection OPERATION ::= {
 	RETURN RESULT	FALSE
 	ERRORS			{systemFailure |
@@ -587,6 +763,18 @@ EntityReleasedArg {PARAMETERS-BOUND : bound} ::= CHOICE {
 	bCSM-Failure						[1]	BCSM-Failure {bound}
 	}
 
+establishTemporaryConnectionV2 OPERATION ::= {
+	ARGUMENT		EstablishTemporaryConnectionArgV2
+	RETURN RESULT FALSE
+	ERRORS			{eTCFailed |
+					missingParameter |
+					systemFailure |
+					taskRefused |
+					unexpectedComponentSequence |
+					unexpectedDataValue |
+					unexpectedParameter}
+	CODE			opcode-establishTemporaryConnection}
+
 establishTemporaryConnection {PARAMETERS-BOUND : bound} OPERATION ::= {
 	ARGUMENT		EstablishTemporaryConnectionArg {bound}
 	RETURN RESULT	FALSE
@@ -605,6 +793,19 @@ establishTemporaryConnection {PARAMETERS-BOUND : bound} OPERATION ::= {
 -- the use of the assist procedure. Refer to clause 11 for a description of the
 -- procedures associated with this operation.
 
+EstablishTemporaryConnectionArgV2 	::= SEQUENCE {
+	assistingSSPIPRoutingAddress		[0] AssistingSSPIPRoutingAddress {cAPSpecificBoundSet},
+	correlationID						[1] CorrelationID {cAPSpecificBoundSet}						OPTIONAL,
+	scfID								[3] ScfID {cAPSpecificBoundSet}							OPTIONAL,
+	extensions							[4] SEQUENCE SIZE(1..numOfExtensionsV1)	OF
+															ExtensionField 		OPTIONAL,
+	serviceInteractionIndicatorsTwo		[7] ServiceInteractionIndicatorsTwo		OPTIONAL,
+  	...,
+	na-info							[50] NA-Info							OPTIONAL
+	}
+--	na-info is included at the discretion of the
+--	gsmSCF operator.
+
 EstablishTemporaryConnectionArg {PARAMETERS-BOUND : bound} ::= SEQUENCE {
 	assistingSSPIPRoutingAddress		[0] AssistingSSPIPRoutingAddress {bound},
 	correlationID						[1] CorrelationID {bound}					OPTIONAL,
@@ -627,6 +828,14 @@ eventReportBCSMV1 OPERATION ::= {
 	CODE			opcode-eventReportBCSM
 }
 
+eventReportBCSMV2 OPERATION ::= {
+	-- config is the same
+	ARGUMENT		EventReportBCSMArgV1
+	RETURN RESULT	FALSE
+	ALWAYS RESPONDS	FALSE
+	CODE			opcode-eventReportBCSM
+}
+
 eventReportBCSM {PARAMETERS-BOUND : bound} OPERATION ::= {
 	ARGUMENT		EventReportBCSMArg {bound}
 	RETURN RESULT	FALSE
@@ -655,6 +864,16 @@ EventReportBCSMArg {PARAMETERS-BOUND : bound} ::= SEQUENCE {
 	...
 	}
 
+furnishChargingInformationV2 OPERATION ::= {
+	ARGUMENT		FurnishChargingInformationArgV2
+	RETURN RESULT	FALSE
+	ERRORS			{missingParameter |
+					taskRefused |
+					unexpectedComponentSequence |
+					unexpectedDataValue |
+					unexpectedParameter}
+	CODE			opcode-furnishChargingInformation}
+
 furnishChargingInformation {PARAMETERS-BOUND : bound} OPERATION ::= {
 	ARGUMENT		FurnishChargingInformationArg {bound}
 	RETURN RESULT	FALSE
@@ -670,6 +889,8 @@ furnishChargingInformation {PARAMETERS-BOUND : bound} OPERATION ::= {
 -- or to include some information in the default call record.
 -- The registered call record is intended for off line charging of the call.
 
+FurnishChargingInformationArgV2 		::= FCIBillingChargingCharacteristics {cAPSpecificBoundSet}
+
 FurnishChargingInformationArg {PARAMETERS-BOUND : bound} ::=
 	FCIBillingChargingCharacteristics{bound}
 
@@ -687,6 +908,20 @@ initialDPV1 OPERATION ::= {
 		}
 	CODE			opcode-initialDP}
 
+initialDPV2 OPERATION ::= {
+	ARGUMENT		InitialDPArgV2
+	RETURN RESULT	FALSE
+	ERRORS {
+		missingCustomerRecord |
+		missingParameter |
+		systemFailure |
+		taskRefused |
+		unexpectedComponentSequence |
+		unexpectedDataValue |
+		unexpectedParameter
+		}
+	CODE			opcode-initialDP}
+
 initialDP {PARAMETERS-BOUND : bound} OPERATION ::= {
 	ARGUMENT		InitialDPArg {bound}
 	RETURN RESULT	FALSE
@@ -726,6 +961,36 @@ InitialDPArgV1						::= SEQUENCE {
 ...
 	}
 
+InitialDPArgV2						::= SEQUENCE {
+	serviceKey							[0] ServiceKey,
+	calledPartyNumber					[2] CalledPartyNumber					OPTIONAL,
+	callingPartyNumber					[3] CallingPartyNumber					OPTIONAL,
+	callingPartysCategory				[5] CallingPartysCategory				OPTIONAL,
+	iPSSPCapabilities					[8] IPSSPCapabilities					OPTIONAL,
+	locationNumber						[10] LocationNumber						OPTIONAL,
+	originalCalledPartyID				[12] OriginalCalledPartyID				OPTIONAL,
+	extensions							[15] SEQUENCE SIZE(1..numOfExtensionsV1) 	OF 
+															ExtensionField		OPTIONAL,
+	highLayerCompatibility				[23] HighLayerCompatibility				OPTIONAL,
+	additionalCallingPartyNumber		[25] AdditionalCallingPartyNumber		OPTIONAL,
+	bearerCapability					[27] BearerCapability					OPTIONAL,
+	eventTypeBCSM						[28] EventTypeBCSM						OPTIONAL,
+	redirectingPartyID					[29] RedirectingPartyID					OPTIONAL,
+	redirectionInformation				[30] RedirectionInformation				OPTIONAL,
+	iMSI								[50] IMSI								OPTIONAL,
+	subscriberState						[51] SubscriberState					OPTIONAL,
+	locationInformation					[52] LocationInformation				OPTIONAL,
+	ext-basicServiceCode				[53] Ext-BasicServiceCode				OPTIONAL,
+	callReferenceNumber					[54] CallReferenceNumber				OPTIONAL,
+	mscAddress							[55] ISDN-AddressString					OPTIONAL,
+	calledPartyBCDNumber				[56] CalledPartyBCDNumber				OPTIONAL,
+	timeAndTimezone						[57] TimeAndTimezone					OPTIONAL,
+	gsm-ForwardingPending				[58] NULL								OPTIONAL,
+		...,
+	initialDPArgExtension				[59] InitialDPArgExtension				OPTIONAL
+
+	}
+
 InitialDPArg {PARAMETERS-BOUND : bound} ::= SEQUENCE {
 	serviceKey							[0] ServiceKey	,
 	calledPartyNumber					[2] CalledPartyNumber {bound}				OPTIONAL,
@@ -875,6 +1140,15 @@ releaseCallV1 OPERATION ::= {
 	CODE			opcode-releaseCall
 }
 
+releaseCallV2 OPERATION ::= {
+	-- same as V1
+	ARGUMENT	ReleaseCallArgV1
+	RETURN RESULT	FALSE
+	ALWAYS RESPONDS	FALSE
+	CODE			opcode-releaseCall
+}
+
+
 releaseCall {PARAMETERS-BOUND : bound} OPERATION ::= {
 	ARGUMENT		ReleaseCallArg {bound}
 	RETURN RESULT	FALSE
@@ -910,6 +1184,18 @@ requestReportBCSMEventV1 OPERATION ::= {
 	CODE			opcode-requestReportBCSMEvent
 }
 
+requestReportBCSMEventV2 OPERATION ::= {
+	ARGUMENT		RequestReportBCSMEventArgV2
+	RETURN RESULT	FALSE
+	ERRORS			{missingParameter |
+					systemFailure |
+					taskRefused |
+					unexpectedComponentSequence |
+					unexpectedDataValue |
+					unexpectedParameter |
+					unknownLegID}
+	CODE			opcode-requestReportBCSMEvent
+}
 
 requestReportBCSMEvent {PARAMETERS-BOUND : bound} OPERATION ::= {
 	ARGUMENT		RequestReportBCSMEventArg {bound}
@@ -942,6 +1228,12 @@ RequestReportBCSMEventArgV1 ::= SEQUENCE  {
 	...
 	}
 
+RequestReportBCSMEventArgV2 ::= SEQUENCE  {
+	bcsmEvents						[0] SEQUENCE SIZE (1..numOfBCSMEventsV1) OF BCSMEventV2,
+	extensions						[2] SEQUENCE SIZE (1..numOfExtensionsV1) OF ExtensionField																			OPTIONAL,
+	...
+	}
+
 RequestReportBCSMEventArg {PARAMETERS-BOUND : bound} ::= SEQUENCE {
 	bcsmEvents							[0] SEQUENCE SIZE(1..bound.&numOfBCSMEvents) OF
 												BCSMEvent {bound},
@@ -950,6 +1242,16 @@ RequestReportBCSMEventArg {PARAMETERS-BOUND : bound} ::= SEQUENCE {
 	}
 -- Indicates the BCSM related events for notification.
 
+resetTimerV2 OPERATION ::= {
+	ARGUMENT		ResetTimerArgV2
+	RETURN RESULT	FALSE
+	ERRORS			{missingParameter |
+					taskRefused |
+					unexpectedComponentSequence |
+					unexpectedDataValue |
+					unexpectedParameter}
+	CODE			opcode-resetTimer}
+
 resetTimer {PARAMETERS-BOUND : bound} OPERATION ::= {
 	ARGUMENT		ResetTimerArg {bound}
 	RETURN RESULT	FALSE
@@ -964,6 +1266,14 @@ resetTimer {PARAMETERS-BOUND : bound} OPERATION ::= {
 -- Direction: gsmSCF -> gsmSSF, Timer: Trt 
 -- This operation is used to request the gsmSSF to refresh an application timer in the gsmSSF.
 
+ResetTimerArgV2 						::= SEQUENCE {
+	timerID								[0] TimerID								DEFAULT tssf,
+	timervalue							[1] TimerValue,
+	extensions							[2] SEQUENCE SIZE(1..numOfExtensionsV1)	OF
+															ExtensionField		OPTIONAL,
+  	...
+	}
+
 ResetTimerArg {PARAMETERS-BOUND : bound} ::= SEQUENCE {
 	timerID								[0] TimerID	DEFAULT tssf,
 	timervalue							[1] TimerValue,
@@ -972,6 +1282,19 @@ ResetTimerArg {PARAMETERS-BOUND : bound} ::= SEQUENCE {
 	...
 	}
 
+sendChargingInformationV2 OPERATION ::= {
+	ARGUMENT		SendChargingInformationArgV2
+	RETURN RESULT	FALSE
+	ERRORS			{missingParameter |
+					unexpectedComponentSequence |
+					unexpectedParameter |
+					parameterOutOfRange |
+					systemFailure |
+					taskRefused |
+					unexpectedDataValue |
+					unknownLegID}
+	CODE			opcode-sendChargingInformation}
+
 sendChargingInformation {PARAMETERS-BOUND : bound} OPERATION ::= {
 	ARGUMENT		SendChargingInformationArg {bound}
 	RETURN RESULT	FALSE
@@ -990,6 +1313,14 @@ sendChargingInformation {PARAMETERS-BOUND : bound} OPERATION ::= {
 -- if the gsmSSF is located in the local exchange. In the local exchange
 -- this information may be used to update the charge meter or to create a standard call record.
 
+SendChargingInformationArgV2 ::= SEQUENCE {
+	sCIBillingChargingCharacteristics	[0] SCIBillingChargingCharacteristics {cAPSpecificBoundSet},
+	partyToCharge						[1] SendingSideID,
+	extensions							[2] SEQUENCE SIZE(1..numOfExtensionsV1)	OF
+		  													ExtensionField		OPTIONAL,
+  	...
+}
+
 SendChargingInformationArg {PARAMETERS-BOUND : bound}::= SEQUENCE {
 	sCIBillingChargingCharacteristics	[0] SCIBillingChargingCharacteristics {bound},
 	partyToCharge						[1] SendingSideID,
diff --git a/camel/CAP-gsmSSF-gsmSCF-pkgs-contracts-acs.asn b/camel/CAP-gsmSSF-gsmSCF-pkgs-contracts-acs.asn
index 7c7ba4d..bb15619 100644
--- a/camel/CAP-gsmSSF-gsmSCF-pkgs-contracts-acs.asn
+++ b/camel/CAP-gsmSSF-gsmSCF-pkgs-contracts-acs.asn
@@ -33,39 +33,58 @@ FROM TC-Notation-Extensions tc-NotationExtensions
 
 	activityTest,
 	activityTestV1,
+	activityTestV2,
 	applyCharging {},
+	applyChargingV2,
 	applyChargingReport {},
+	applyChargingReportV2,
 	assistRequestInstructions {},
+	assistRequestInstructionsV2,
 	callGap {},
 	callInformationReport {},
+	callInformationReportV2,
 	callInformationRequest {},
+	callInformationRequestV2,
 	cancel {},
+	cancelV2,
 	collectInformation {},
 	connect {},
 	connectV1,
+	connectV2,
 	connectToResource {},
+	connectToResourceV2,
 	continue,
 	continueV1,
+	continueV2,
 	continueWithArgument {},
 	disconnectForwardConnection,
+	disconnectForwardConnectionV2,
 	disconnectForwardConnectionWithArgument {},
 	disconnectLeg {},
 	entityReleased {},
 	establishTemporaryConnection {},
+	establishTemporaryConnectionV2,
 	eventReportBCSM {},
 	eventReportBCSMV1,
+	eventReportBCSMV2,
 	furnishChargingInformation {},
+	furnishChargingInformationV2,
 	initialDP {},
 	initialDPV1,
+	initialDPV2,
 	initiateCallAttempt {},
 	moveLeg {},
 	playTone {},
 	releaseCall {},
 	releaseCallV1,
+	releaseCallV2,
 	requestReportBCSMEvent {},
 	requestReportBCSMEventV1,
+	requestReportBCSMEventV2,
 	resetTimer {},
+	resetTimerV2,
 	sendChargingInformation {},
+	sendChargingInformationV2,
 	splitLeg {}
 FROM CAP-gsmSSF-gsmSCF-ops-args gsmSSF-gsmSCF-Operations
 -- Object Identifier 'gsmSSF-gsmSCF-Operations' is updated to version8(7) in Rel-6. As
@@ -82,7 +101,8 @@ FROM CAP-gsmSCF-gsmSRF-ops-args gsmSCF-gsmSRF-Operations-- Object Identifier 'gs
 -- definitions are used in the ABSTRACT SYNTAX definitions and in the OPERATION PACKAGE
 -- definitions.
 
-	specializedResourceControlPackage {}
+	specializedResourceControlPackage {},
+	specializedResourceControlPackageV2
 FROM CAP-gsmSCF-gsmSRF-pkgs-contracts-acs gsmSCF-gsmSRF-Protocol
 -- Object Identifier 'gsmSCF-gsmSRF-Protocol' is updated to version8(7) in Rel-6. As a
 -- result, the present module, 'CAP-gsmSSF-gsmSCF-pkgs-contracts-acs', IMPORTS CAP Operation
@@ -162,6 +182,13 @@ capssf-scfGenericACV1 APPLICATION-CONTEXT ::= {
 								gsmSSF-scfGenericAbstractSyntax} 
 	APPLICATION CONTEXT NAME	id-ac-CAP-gsmSSF-scfGenericACV1}
 
+capssf-scfGenericACV2 APPLICATION-CONTEXT ::= {
+	CONTRACT					capSsfToScfGenericV2
+	DIALOGUE MODE				structured
+	ABSTRACT SYNTAXES			{dialogue-abstract-syntax |
+								gsmSSF-scfGenericAbstractSyntax} 
+	APPLICATION CONTEXT NAME	id-ac-CAP-gsmSSF-scfGenericACV2}
+
 capssf-scfGenericAC APPLICATION-CONTEXT ::= {
 	CONTRACT					capSsfToScfGeneric
 	DIALOGUE MODE				structured
@@ -171,6 +198,13 @@ capssf-scfGenericAC APPLICATION-CONTEXT ::= {
 -- 'capSsfToScfGeneric' and 'gsmSSF-scfGenericAbstractSyntax' are defined in the present
 -- module.
 
+capssf-scfAssistHandoffACV2 APPLICATION-CONTEXT ::= {
+	CONTRACT					capAssistHandoffssfToScfV2
+	DIALOGUE MODE				structured
+	ABSTRACT SYNTAXES			{dialogue-abstract-syntax |
+								assistHandoff-gsmSSF-scfAbstractSyntax}
+	APPLICATION CONTEXT NAME	id-ac-CAP-gsmSSF-scfAssistHandoffACV2}
+
 capssf-scfAssistHandoffAC APPLICATION-CONTEXT ::= {
 	CONTRACT					capAssistHandoffssfToScf
 	DIALOGUE MODE				structured
@@ -199,6 +233,25 @@ capSsfToScfGenericV1 CONTRACT ::= {
 					bcsmEventHandlingPackageV1 | ssfCallProcessingPackageV1}
 }
 
+capSsfToScfGenericV2 CONTRACT ::= {
+	INITIATOR CONSUMER OF		{scfActivationPackageV2}
+	RESPONDER CONSUMER OF		{assistConnectionEstablishmentPackageV2 |
+						nonAssistedConnectionEstablishmentPackageV2 |
+						genericDisconnectResourcePackageV2 |
+						connectPackageV2 |
+						callHandlingPackageV2 |
+						bcsmEventHandlingPackageV2 |
+						chargingPackageV2 |
+						ssfCallProcessingPackageV2 |
+						timerPackageV2 |
+						billingPackageV2 |
+						callReportPackageV2 |
+						signallingControlPackageV2 |
+						specializedResourceControlPackageV2 |
+						cancelPackageV2 |
+						activityTestPackageV2}
+}
+
 capSsfToScfGeneric CONTRACT ::= {
 -- dialogue initiated by gsmSSF with InitialDP Operation
 	INITIATOR CONSUMER OF		{exceptionInformPackage {cAPSpecificBoundSet} |
@@ -226,6 +279,16 @@ capSsfToScfGeneric CONTRACT ::= {
 -- The OPERATION-PACKAGEs are defined in the present module, except for
 -- specializedResourceControlPackage, which is defined in CAP-gsmSCF-gsmSRF-pkgs-contracts-acs.
 
+capAssistHandoffssfToScfV2 CONTRACT ::= {
+	INITIATOR CONSUMER OF		{gsmSRF-scfActivationOfAssistPackageV2}
+	RESPONDER CONSUMER OF		{genericDisconnectResourcePackageV2 |
+						nonAssistedConnectionEstablishmentPackageV2 |
+						timerPackageV2 |
+						specializedResourceControlPackageV2 |
+						cancelPackageV2 |
+						activityTestPackageV2}
+}
+
 capAssistHandoffssfToScf CONTRACT ::= {
 -- dialogue initiated by gsmSSF with AssistRequestInstructions
 	INITIATOR CONSUMER OF		{gsmSRF-scfActivationOfAssistPackage {cAPSpecificBoundSet}}
@@ -273,23 +336,44 @@ scfActivationPackageV1 OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{initialDPV1}
 }
 
+scfActivationPackageV2 OPERATION-PACKAGE ::= {
+	CONSUMER INVOKES	{initialDPV2}
+}
+
 scfActivationPackage {PARAMETERS-BOUND : bound} OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{initialDP {bound}}
 	ID					id-package-scfActivation}
 
+gsmSRF-scfActivationOfAssistPackageV2 OPERATION-PACKAGE ::= {
+	CONSUMER INVOKES	{assistRequestInstructionsV2}
+	SUPPLIER INVOKES	{establishTemporaryConnectionV2}
+}
+
 gsmSRF-scfActivationOfAssistPackage {PARAMETERS-BOUND : bound} OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{assistRequestInstructions {bound}}
 	ID					id-package-gsmSRF-scfActivationOfAssist}
 
+assistConnectionEstablishmentPackageV2 OPERATION-PACKAGE ::= {
+	CONSUMER INVOKES	{establishTemporaryConnectionV2}
+}
+
 assistConnectionEstablishmentPackage {PARAMETERS-BOUND : bound} OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{establishTemporaryConnection {bound}}
 	ID					id-package-assistConnectionEstablishment}
 
+genericDisconnectResourcePackageV2 OPERATION-PACKAGE ::= {
+	CONSUMER INVOKES	{disconnectForwardConnectionV2}
+}
+
 genericDisconnectResourcePackage {PARAMETERS-BOUND : bound} OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{disconnectForwardConnection |
 						disconnectForwardConnectionWithArgument {bound}}
 	ID					id-package-genericDisconnectResource}
 
+nonAssistedConnectionEstablishmentPackageV2 OPERATION-PACKAGE ::= {
+	CONSUMER INVOKES	{connectToResourceV2}
+}
+
 nonAssistedConnectionEstablishmentPackage {PARAMETERS-BOUND : bound} OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{connectToResource {bound}}
 	ID					id-package-nonAssistedConnectionEstablishment}
@@ -298,6 +382,10 @@ connectPackageV1 OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{connectV1}
 }
 
+connectPackageV2 OPERATION-PACKAGE ::= {
+	CONSUMER INVOKES	{connectV2}
+}
+
 connectPackage {PARAMETERS-BOUND : bound} OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{connect {bound}}
 	ID					id-package-connect}
@@ -306,6 +394,10 @@ callHandlingPackageV1 OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{releaseCallV1}
 }
 
+callHandlingPackageV2 OPERATION-PACKAGE ::= {
+	CONSUMER INVOKES	{releaseCallV2}
+}
+
 callHandlingPackage {PARAMETERS-BOUND : bound} OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{releaseCall {bound}}
 	ID					id-package-callHandling}
@@ -315,6 +407,11 @@ bcsmEventHandlingPackageV1 OPERATION-PACKAGE ::= {
 	SUPPLIER INVOKES	{requestReportBCSMEventV1}
 }
 
+bcsmEventHandlingPackageV2 OPERATION-PACKAGE ::= {
+	CONSUMER INVOKES	{eventReportBCSMV2}
+	SUPPLIER INVOKES	{requestReportBCSMEventV2}
+}
+
 bcsmEventHandlingPackage {PARAMETERS-BOUND : bound} OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{requestReportBCSMEvent {bound}}
 	SUPPLIER INVOKES	{eventReportBCSM {bound}}
@@ -324,6 +421,10 @@ ssfCallProcessingPackageV1 OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{continueV1}
 }
 
+ssfCallProcessingPackageV2 OPERATION-PACKAGE ::= {
+	CONSUMER INVOKES	{continueV2}
+}
+
 ssfCallProcessingPackage {PARAMETERS-BOUND : bound} OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{collectInformation | continueWithArgument {bound} | continue}
 	ID					id-package-ssfCallProcessing}
@@ -332,14 +433,27 @@ scfCallInitiationPackage {PARAMETERS-BOUND : bound} OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{initiateCallAttempt {bound}}
 	ID					id-package-scfCallInitiation}
 
+timerPackageV2 OPERATION-PACKAGE ::= {
+	CONSUMER INVOKES	{resetTimerV2}
+}
+
 timerPackage {PARAMETERS-BOUND : bound} OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{resetTimer {bound}}
 	ID					id-package-timer}
 
+billingPackageV2 OPERATION-PACKAGE ::= {
+	CONSUMER INVOKES	{furnishChargingInformationV2}
+}
+
 billingPackage {PARAMETERS-BOUND : bound} OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{furnishChargingInformation {bound}}
 	ID					id-package-billing}
 
+chargingPackageV2 OPERATION-PACKAGE ::= {
+	CONSUMER INVOKES	{applyChargingV2}
+	SUPPLIER INVOKES	{applyChargingReportV2}
+}
+
 chargingPackage {PARAMETERS-BOUND : bound} OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{applyCharging {bound}}
 	SUPPLIER INVOKES	{applyChargingReport {bound}}
@@ -349,11 +463,20 @@ trafficManagementPackage {PARAMETERS-BOUND : bound} OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{callGap {bound}}
 	ID					id-package-trafficManagement}
 
+callReportPackageV2 OPERATION-PACKAGE ::= {
+	CONSUMER INVOKES	{callInformationRequestV2}
+	SUPPLIER INVOKES	{callInformationReportV2}
+}
+
 callReportPackage {PARAMETERS-BOUND : bound} OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{callInformationRequest {bound}}
 	SUPPLIER INVOKES	{callInformationReport {bound}}
 	ID					id-package-callReport}
 
+signallingControlPackageV2 OPERATION-PACKAGE ::= {
+	CONSUMER INVOKES	{sendChargingInformationV2}
+}
+
 signallingControlPackage {PARAMETERS-BOUND : bound} OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{sendChargingInformation {bound}}
 	ID					id-package-signallingControl}
@@ -362,10 +485,18 @@ activityTestPackageV1 OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{activityTestV1}
 }
 
+activityTestPackageV2 OPERATION-PACKAGE ::= {
+	CONSUMER INVOKES	{activityTestV2}
+}
+
 activityTestPackage OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{activityTest}
 	ID					id-package-activityTest}
 
+cancelPackageV2 OPERATION-PACKAGE ::= {
+	CONSUMER INVOKES	{cancelV2}
+}
+
 cancelPackage {PARAMETERS-BOUND : bound} OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{cancel {bound}}
 	ID					id-package-cancel}
diff --git a/camel/CAP-object-identifiers.asn b/camel/CAP-object-identifiers.asn
index 9efd4dc..863ca96 100644
--- a/camel/CAP-object-identifiers.asn
+++ b/camel/CAP-object-identifiers.asn
@@ -90,6 +90,8 @@ gprsSSF-gsmSCF-Protocol							OBJECT IDENTIFIER ::=
 -- The Object Identifier 'gprsSSF-gsmSCF-Protocol' is updated to version8(7) in Rel-6, so
 -- other modules can IMPORT Rel-6 Protocol definitions related to GPRS control.
 
+id-GSM-ac OBJECT IDENTIFIER ::= {ccitt(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) ac(0)}
+
 id-CAP											OBJECT IDENTIFIER ::=
 	{itu-t(0) identified-organization(4) etsi(0) mobileDomain(0)
 	umts-network(1) cap4(22)}
@@ -136,11 +138,14 @@ id-rosObject-smsSSF-V4							OBJECT IDENTIFIER ::= {id-rosObject 9}
 
 -- gsmSSF/gsmSCF AC
 id-ac-CAP-gsmSSF-scfGenericACV1					OBJECT IDENTIFIER ::= {id-GSM-ac cap-gsmssf-to-gsmscf(50) version1(0)}
+id-ac-CAP-gsmSSF-scfGenericACV2					OBJECT IDENTIFIER ::= {id-GSM-ac cap-gsmssf-to-gsmscf(50) version2(1)}
 id-ac-CAP-gsmSSF-scfGenericAC					OBJECT IDENTIFIER ::= {id-acE 4}
+id-ac-CAP-gsmSSF-scfAssistHandoffACV2				OBJECT IDENTIFIER ::= {id-GSM-ac cap-assist-handoff-gsmssf-to-gsmscf(51) version2(1)}
 id-ac-CAP-gsmSSF-scfAssistHandoffAC				OBJECT IDENTIFIER ::= {id-acE 6}
 id-ac-CAP-scf-gsmSSFGenericAC					OBJECT IDENTIFIER ::= {id-acE 8}
 
 -- gsmSRF/gsmSCF AC
+id-ac-gsmSRF-gsmSCFV2						OBJECT IDENTIFIER ::= {id-GSM-ac cap-gsmSRF-to-gsmscf(52) version2(1)}
 id-ac-gsmSRF-gsmSCF								OBJECT IDENTIFIER ::= {id-ac 14}
 
 -- gprsSSF/gsmSCF AC