camel: Add Phase2 to the Phase3 files

Same issues like in the previous import apply

6 files changed, 548 insertions, 1 deletions

diff --git a/camel/phase3/CAP-datatypes.asn b/camel/phase3/CAP-datatypes.asn
index c334142..fb5f8df 100644
--- a/camel/phase3/CAP-datatypes.asn
+++ b/camel/phase3/CAP-datatypes.asn
@@ -157,6 +157,13 @@ BCSMEventV1							::= SEQUENCE {
 	legID							[2] LegID							OPTIONAL
 	}
 
+BCSMEventV2							::= SEQUENCE {
+	eventTypeBCSM						[0] EventTypeBCSM,
+	monitorMode							[1] MonitorMode,
+	legID								[2] LegID								OPTIONAL,
+	dpSpecificCriteria					[30] DpSpecificCriteria					OPTIONAL
+	}
+
 BCSMEvent  ::= SEQUENCE {
 	eventTypeBCSM		[0] EventTypeBCSM,
 	monitorMode			[1] MonitorMode,
@@ -904,12 +911,43 @@ MSRadioAccessCapability					::= OCTET STRING (SIZE (1..50))
 -- It shall contain the value part defined in 3GPP TS 24.008 only. I.e. the 3GPP TS 24.008 IEI
 -- and 3GPP TS 24.008 octet length indicator shall not be included.
 
+NACarrierInformationV2				::= SEQUENCE { 
+		naCarrierId						[0] NAEA-CIC								OPTIONAL,
+		naCICSelectionType				[1] NACarrierSelectionInfoV2					OPTIONAL,
+		...}
+
+NACarrierSelectionInfoV2				::= 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 ISUP T1.113 [53]
 --  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)
 
+NAChargeNumberV2						::= 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-InfoV2							::= SEQUENCE {
+	naCarrierInformation				[0] NACarrierInformationV2				OPTIONAL,
+	naOliInfo							[1] NAOliInfo							OPTIONAL,
+	naChargeNumber						[2] NAChargeNumberV2						OPTIONAL,
+	...}
+
 OriginalCalledPartyID {PARAMETERS-BOUND : bound}				::= OCTET STRING (SIZE(
 	bound.&minOriginalCalledPartyIDLength .. bound.&maxOriginalCalledPartyIDLength))
 
diff --git a/camel/phase3/CAP-gsmSCF-gsmSRF-ops-args.asn b/camel/phase3/CAP-gsmSCF-gsmSRF-ops-args.asn
index c4cc9e9..d4fccc0 100644
--- a/camel/phase3/CAP-gsmSCF-gsmSRF-ops-args.asn
+++ b/camel/phase3/CAP-gsmSCF-gsmSRF-ops-args.asn
@@ -52,6 +52,19 @@ umts-network(1) modules(3) cap-object-identifiers(100) version3(2)}
 
 ;
 
+playAnnouncementV2 OPERATION ::= {
+	ARGUMENT		PlayAnnouncementArgV2
+	RETURN RESULT	FALSE
+	ERRORS			{canceled |
+					missingParameter |
+					systemFailure |
+					unavailableResource |
+					unexpectedComponentSequence |
+					unexpectedDataValue |
+					unexpectedParameter}
+	LINKED			{specializedResourceReportV2}
+	CODE			opcode-playAnnouncement}
+
 playAnnouncementV3 {PARAMETERS-BOUND : bound} OPERATION ::= {
 	ARGUMENT		PlayAnnouncementArgV3 {bound}
 	RETURN RESULT	FALSE
@@ -77,6 +90,15 @@ playAnnouncementV3 {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,
+  	...
+	}
+
 PlayAnnouncementArgV3 {PARAMETERS-BOUND : bound}::= SEQUENCE {
 	informationToSend			[0] InformationToSend {bound},
 	disconnectFromIPForbidden	[1] BOOLEAN	DEFAULT TRUE,
@@ -85,6 +107,21 @@ PlayAnnouncementArgV3 {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}
+
 promptAndCollectUserInformationV3 {PARAMETERS-BOUND : bound} OPERATION ::= {
 	ARGUMENT		PromptAndCollectUserInformationArgV3 {bound}
 	RESULT			ReceivedInformationArgV3 {bound}
@@ -104,6 +141,15 @@ promptAndCollectUserInformationV3 {PARAMETERS-BOUND : bound} OPERATION ::= {
 -- Direction: gsmSCF -> gsmSRF, Timer: Tpc 
 -- This operation is used to interact with a user to collect information.
 
+PromptAndCollectUserInformationArgV2	::= SEQUENCE {
+	collectedInfo						[0] CollectedInfo,
+	disconnectFromIPForbidden			[1] BOOLEAN								DEFAULT TRUE,
+	informationToSend 					[2] InformationToSend {cAPSpecificBoundSet}					OPTIONAL,
+	extensions							[3] SEQUENCE SIZE(1..numOfExtensionsV1)	OF
+														ExtensionField 			OPTIONAL,
+  	...
+	}
+
 PromptAndCollectUserInformationArgV3 {PARAMETERS-BOUND : bound}::= SEQUENCE {
 	collectedInfo				[0] CollectedInfo,
 	disconnectFromIPForbidden	[1] BOOLEAN	DEFAULT TRUE,
@@ -112,10 +158,20 @@ PromptAndCollectUserInformationArgV3 {PARAMETERS-BOUND : bound}::= SEQUENCE {
 	...
 	}
 
+ReceivedInformationArgV2 				::= CHOICE {
+	digitsResponse						[0] Digits {cAPSpecificBoundSet}
+	}
+
 ReceivedInformationArgV3 {PARAMETERS-BOUND : bound}::= CHOICE {
 	digitsResponse				[0] Digits {bound}
 	}
 
+specializedResourceReportV2 OPERATION ::= {
+	ARGUMENT		SpecializedResourceReportArgV2
+	RETURN RESULT	FALSE
+	ALWAYS RESPONDS	FALSE
+	CODE			opcode-specializedResourceReport}
+
 specializedResourceReportV3 OPERATION ::= {
 	ARGUMENT		SpecializedResourceReportArgV3
 	RETURN RESULT	FALSE
@@ -126,6 +182,7 @@ specializedResourceReportV3 OPERATION ::= {
 -- This operation is used as the response to a PlayAnnouncement operation when the announcement 
 -- completed report indication is set.
 
+SpecializedResourceReportArgV2 ::=  NULL
 SpecializedResourceReportArgV3 ::= NULL
 
 END
diff --git a/camel/phase3/CAP-gsmSCF-gsmSRF-pkgs-contracts-acs.asn b/camel/phase3/CAP-gsmSCF-gsmSRF-pkgs-contracts-acs.asn
index 0230a28..b0f0eed 100644
--- a/camel/phase3/CAP-gsmSCF-gsmSRF-pkgs-contracts-acs.asn
+++ b/camel/phase3/CAP-gsmSCF-gsmSRF-pkgs-contracts-acs.asn
@@ -29,16 +29,22 @@ FROM TCAPMessages tc-Messages
 	dialogue-abstract-syntax
 FROM TC-Notation-Extensions tc-NotationExtensions
 
+	playAnnouncementV2,
 	playAnnouncementV3 {},
+	promptAndCollectUserInformationV2,
 	promptAndCollectUserInformationV3 {},
+	specializedResourceReportV2,
 	specializedResourceReportV3
 FROM CAP-gsmSCF-gsmSRF-ops-args gsmSCF-gsmSRF-Operations
 
+	activityTestV2,
 	activityTestV3,
+	cancelV2,
 	cancelV3,
 	assistRequestInstructionsV3{}
 FROM CAP-gsmSSF-gsmSCF-ops-args gsmSSF-gsmSCF-Operations
 
+	gsmSRF-scfActivationOfAssistPackageV2,
 	gsmSRF-scfActivationOfAssistPackageV3{}
 FROM CAP-gsmSSF-gsmSCF-pkgs-contracts-acs gsmSSF-gsmSCF-Protocol
 
@@ -62,6 +68,14 @@ umts-network(1) modules(3) cap-object-identifiers(100) version3(2)}
 
 -- Application Contexts 
 
+gsmSRF-gsmSCF-acV2 APPLICATION-CONTEXT ::= {
+	CONTRACT					gsmSRF-gsmSCF-contractV2
+	DIALOGUE MODE				structured
+	TERMINATION					basic
+	ABSTRACT SYNTAXES			{dialogue-abstract-syntax |
+								gsmSRF-gsmSCF-abstract-syntaxV3}
+	APPLICATION CONTEXT NAME	id-ac-gsmSRF-gsmSCFV2}
+
 gsmSRF-gsmSCF-acV3 APPLICATION-CONTEXT ::= {
 	CONTRACT					gsmSRF-gsmSCF-contractV3
 	DIALOGUE MODE				structured
@@ -72,6 +86,13 @@ gsmSRF-gsmSCF-acV3 APPLICATION-CONTEXT ::= {
 
 -- Contracts 
 
+gsmSRF-gsmSCF-contractV2 CONTRACT ::= {
+	INITIATOR CONSUMER OF		{gsmSRF-scfActivationOfAssistPackageV2}
+	RESPONDER CONSUMER OF		{specializedResourceControlPackageV2 |
+						gsmSRF-scfCancelPackageV2 |
+						activityTestPackageV2}
+}
+
 gsmSRF-gsmSCF-contractV3 CONTRACT ::= {
 	INITIATOR CONSUMER OF
 			{gsmSRF-scfActivationOfAssistPackageV3 {cAPSpecificBoundSet}}
@@ -83,16 +104,23 @@ gsmSRF-gsmSCF-contractV3 CONTRACT ::= {
 
 -- Operation Packages
 
+specializedResourceControlPackageV2 OPERATION-PACKAGE ::= {
+	CONSUMER INVOKES		{playAnnouncementV2 | promptAndCollectUserInformationV2}
+	SUPPLIER INVOKES		{specializedResourceReportV2}}
 specializedResourceControlPackageV3 {PARAMETERS-BOUND : bound} OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{playAnnouncementV3 {bound} |
 						promptAndCollectUserInformationV3 {bound}}
 	SUPPLIER INVOKES	{specializedResourceReportV3}
 	ID					id-package-specializedResourceControlV3}
 
+gsmSRF-scfCancelPackageV2 OPERATION-PACKAGE ::= {
+	CONSUMER INVOKES	{cancelV2}}
 gsmSRF-scfCancelPackageV3	OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{cancelV3}
 	ID					id-package-gsmSRF-scfCancelV3}
 
+activityTestPackageV2 OPERATION-PACKAGE ::= {
+	CONSUMER INVOKES	{activityTestV2}}
 activityTestPackageV3		OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{activityTestV3}
 	ID					id-package-activityTestV3}
diff --git a/camel/phase3/CAP-gsmSSF-gsmSCF-ops-args.asn b/camel/phase3/CAP-gsmSSF-gsmSCF-ops-args.asn
index aa9da82..a07792a 100644
--- a/camel/phase3/CAP-gsmSSF-gsmSCF-ops-args.asn
+++ b/camel/phase3/CAP-gsmSSF-gsmSCF-ops-args.asn
@@ -114,6 +114,7 @@ FROM CAP-operationcodes operationcodes
 	LocationNumber {},
 	MonitorMode,
 	NAOliInfo,
+	NA-InfoV2,
 	OCSIApplicable,
 	OriginalCalledPartyID {},
 	ReceivingSideID,
@@ -149,6 +150,10 @@ activityTestV1 OPERATION ::= {
 	RETURN RESULT	TRUE
 	CODE			opcode-activityTest}
 
+activityTestV2 OPERATION ::= {
+	RETURN RESULT	TRUE
+	CODE			opcode-activityTest}
+
 activityTestV3 OPERATION ::= {
 	RETURN RESULT TRUE
 	CODE	opcode-activityTest
@@ -160,6 +165,19 @@ activityTestV3 OPERATION ::= {
 -- then the gsmSCF will assume that the gsmSSF, assistSSF or grmSRF has failed
 -- in some way.
 
+applyChargingV2 OPERATION ::= {
+	ARGUMENT		ApplyChargingArgV2
+	RETURN RESULT		FALSE
+	ERRORS			{missingParameter |
+					unexpectedComponentSequence |
+					unexpectedParameter |
+					unexpectedDataValue |
+					parameterOutOfRange |
+					systemFailure |
+					taskRefused |
+					unknownLegID}
+	CODE			opcode-applyCharging}
+
 applyChargingV3 {PARAMETERS-BOUND : bound} OPERATION ::= {
 	ARGUMENT		ApplyChargingArgV3 {bound}
 	RETURN RESULT	FALSE
@@ -177,6 +195,15 @@ applyChargingV3 {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,
+  	...
+	}
+
 ApplyChargingArgV3 {PARAMETERS-BOUND : bound} ::= SEQUENCE {
 	aChBillingChargingCharacteristics	[0] AChBillingChargingCharacteristics {bound},
 	partyToCharge						[2] SendingSideID	DEFAULT sendingSideID : leg1,
@@ -187,6 +214,18 @@ ApplyChargingArgV3 {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}
+
 applyChargingReportV3 {PARAMETERS-BOUND : bound} OPERATION ::= {
 	ARGUMENT		ApplyChargingReportArgV3 {bound}
 	RETURN RESULT	FALSE
@@ -203,8 +242,20 @@ applyChargingReportV3 {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}
 ApplyChargingReportArgV3 {PARAMETERS-BOUND : bound} ::= CallResult {bound}
 
+assistRequestInstructionsV2 OPERATION ::= {
+	ARGUMENT		AssistRequestInstructionsArgV2
+	RETURN RESULT	FALSE
+	ERRORS			{missingCustomerRecord |
+					missingParameter |
+					taskRefused |
+					unexpectedComponentSequence |
+					unexpectedDataValue |
+					unexpectedParameter}
+	CODE			opcode-assistRequestInstructions}
+
 assistRequestInstructionsV3 {PARAMETERS-BOUND : bound} OPERATION ::= {
 	ARGUMENT		AssistRequestInstructionsArgV3 {bound}
 	RETURN RESULT	FALSE
@@ -226,6 +277,14 @@ assistRequestInstructionsV3 {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,
+  	...
+	}
+
 AssistRequestInstructionsArgV3 {PARAMETERS-BOUND : bound} ::= SEQUENCE {
 	correlationID		[0] CorrelationID {bound},
 	iPSSPCapabilities	[2] IPSSPCapabilities {bound},
@@ -257,6 +316,12 @@ CallGapArgV3 {PARAMETERS-BOUND : bound}::= SEQUENCE {
 -- OPTIONAL denotes network operator optional. If gapTreatment is not present, 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}
+
 callInformationReportV3 {PARAMETERS-BOUND : bound} OPERATION ::= {
 	ARGUMENT		CallInformationReportArgV3 {bound}
 	RETURN RESULT	FALSE
@@ -267,6 +332,14 @@ callInformationReportV3 {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,
+  	...
+	}
+
 CallInformationReportArgV3 {PARAMETERS-BOUND : bound} ::= SEQUENCE {
 	requestedInformationList	[0] RequestedInformationList {bound},
 	extensions					[2] Extensions {bound} 	OPTIONAL,
@@ -274,6 +347,20 @@ CallInformationReportArgV3 {PARAMETERS-BOUND : bound} ::= SEQUENCE {
 	...
 	}
 
+callInformationRequestV2 OPERATION ::= {
+	ARGUMENT		CallInformationRequestArgV2
+	RETURN RESULT	FALSE
+	ERRORS			{missingParameter |
+					parameterOutOfRange |
+					requestedInfoError |
+					systemFailure |
+					taskRefused |
+					unexpectedComponentSequence |
+					unexpectedDataValue |
+					unexpectedParameter |
+					unknownLegID}
+}
+
 callInformationRequestV3 {PARAMETERS-BOUND : bound} OPERATION ::= {
 	ARGUMENT		CallInformationRequestArgV3 {bound}
 	RETURN RESULT	FALSE
@@ -292,6 +379,14 @@ callInformationRequestV3 {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,
+  	...
+	}
+
 CallInformationRequestArgV3 {PARAMETERS-BOUND : bound}::= SEQUENCE {
 	requestedInformationTypeList	[0] RequestedInformationTypeList,
 	extensions						[2] Extensions {bound} 				OPTIONAL,
@@ -300,6 +395,12 @@ CallInformationRequestArgV3 {PARAMETERS-BOUND : bound}::= SEQUENCE {
 	}
 -- OPTIONAL denotes network operator optional.
 
+cancelV2 OPERATION ::= {
+	ARGUMENT		CancelArgV2
+	RETURN RESULT		FALSE
+	ERRORS			{cancelFailed}
+	CODE			opcode-cancel}
+
 cancelV3  OPERATION ::= {
 	ARGUMENT		CancelArgV3 
 	RETURN RESULT	FALSE
@@ -312,6 +413,11 @@ cancelV3  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
+}
+
 CancelArgV3 ::= CHOICE {
 	invokeID			[0] InvokeID,
 	allRequests			[1] NULL
@@ -331,6 +437,19 @@ connectV1 OPERATION ::= {
 	CODE			opcode-connect
 }
 
+connectV2 OPERATION ::= {
+	ARGUMENT		ConnectArgV2
+	RETURN RESULT	FALSE
+	ERRORS {
+		missingParameter |
+		systemFailure |
+		taskRefused |
+		unexpectedComponentSequence |
+		unexpectedDataValue |
+		unexpectedParameter}
+	CODE			opcode-connect
+}
+
 connectV3 {PARAMETERS-BOUND : bound} OPERATION ::= {
 	ARGUMENT		ConnectArgV3 {bound}
 	RETURN RESULT	FALSE
@@ -360,6 +479,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-InfoV2							OPTIONAL
+	}
+--	na-Info is included at the discretion of the gsmSCF operator.
+
 ConnectArgV3 {PARAMETERS-BOUND : bound} ::= SEQUENCE {
 	destinationRoutingAddress		[0] DestinationRoutingAddress {bound},
 	alertingPattern	[1] AlertingPattern	OPTIONAL,
@@ -381,6 +517,17 @@ ConnectArgV3 {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}
+
 connectToResourceV3 {PARAMETERS-BOUND : bound} OPERATION ::= {
 	ARGUMENT		ConnectToResourceArgV3 {bound}
 	RETURN RESULT	FALSE
@@ -397,6 +544,17 @@ connectToResourceV3 {PARAMETERS-BOUND : bound} OPERATION ::= {
 -- gsmSRF.
 -- Refer to clause 11 for a description of the procedures associated with this operation.
 
+ConnectToResourceArgV2 				::= SEQUENCE {
+	resourceAddress						CHOICE {
+			ipRoutingAddress				[0]	IPRoutingAddress{cAPSpecificBoundSet},
+			none							[3]	NULL
+			},
+	extensions							[4] SEQUENCE SIZE(1..numOfExtensionsV1)	OF
+	  														ExtensionField		OPTIONAL,
+	serviceInteractionIndicatorsTwo		[7] ServiceInteractionIndicatorsTwo		OPTIONAL,
+  	...
+	}
+
 ConnectToResourceArgV3 {PARAMETERS-BOUND : bound} ::= SEQUENCE {
 	resourceAddress	CHOICE {
 		ipRoutingAddress			[0] IPRoutingAddress {bound},
@@ -413,6 +571,12 @@ continueV1 OPERATION ::= {
 	CODE			opcode-continue
 }
 
+continueV2 OPERATION ::= {
+	RETURN RESULT	FALSE
+	ALWAYS RESPONDS	FALSE
+	CODE			opcode-continue
+}
+
 continueV3 OPERATION ::= {
 	RETURN RESULT	FALSE
 	ALWAYS RESPONDS	FALSE
@@ -456,6 +620,13 @@ ContinueWithArgumentArgV3 {PARAMETERS-BOUND : bound} ::= SEQUENCE {
 	...
 	}
 
+disconnectForwardConnectionV2 OPERATION ::= {
+	RETURN RESULT	FALSE
+	ERRORS			{systemFailure |
+					taskRefused |
+					unexpectedComponentSequence}
+	CODE			opcode-disconnectForwardConnection}
+
 disconnectForwardConnectionV3 OPERATION ::= {
 	RETURN RESULT	FALSE
 	ERRORS 			{systemFailure |
@@ -467,6 +638,18 @@ disconnectForwardConnectionV3 OPERATION ::= {
 -- This operation is used to disconnect a forward temporary connection or a connection to a 
 -- resource. Refer to clause 11 for a description of the procedures associated with this operation. 
 
+establishTemporaryConnectionV2 OPERATION ::= {
+	ARGUMENT		EstablishTemporaryConnectionArgV2
+	RETURN RESULT FALSE
+	ERRORS			{eTCFailed |
+					missingParameter |
+					systemFailure |
+					taskRefused |
+					unexpectedComponentSequence |
+					unexpectedDataValue |
+					unexpectedParameter}
+	CODE			opcode-establishTemporaryConnection}
+
 establishTemporaryConnectionV3 {PARAMETERS-BOUND : bound} OPERATION ::= {
 	ARGUMENT		EstablishTemporaryConnectionArgV3 {bound}
 	RETURN RESULT	FALSE
@@ -485,6 +668,19 @@ establishTemporaryConnectionV3 {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-InfoV2							OPTIONAL
+	}
+--	na-info is included at the discretion of the
+--	gsmSCF operator.
+
 EstablishTemporaryConnectionArgV3 {PARAMETERS-BOUND : bound} ::= SEQUENCE {
 	assistingSSPIPRoutingAddress	[0] AssistingSSPIPRoutingAddress {bound},
 	correlationID					[1] CorrelationID {bound}	OPTIONAL,
@@ -504,6 +700,14 @@ eventReportBCSMV1 OPERATION ::= {
 	CODE			opcode-eventReportBCSM
 }
 
+eventReportBCSMV2 OPERATION ::= {
+	-- config is the same
+	ARGUMENT		EventReportBCSMArgV1
+	RETURN RESULT	FALSE
+	ALWAYS RESPONDS	FALSE
+	CODE			opcode-eventReportBCSM
+}
+
 eventReportBCSMV3 {PARAMETERS-BOUND : bound} OPERATION ::= {
 	ARGUMENT		EventReportBCSMArgV3 {bound}
 	RETURN RESULT	FALSE
@@ -533,6 +737,16 @@ EventReportBCSMArgV3 {PARAMETERS-BOUND : bound} ::= SEQUENCE {
 	...
 	}
 
+furnishChargingInformationV2 OPERATION ::= {
+	ARGUMENT		FurnishChargingInformationArgV2
+	RETURN RESULT	FALSE
+	ERRORS			{missingParameter |
+					taskRefused |
+					unexpectedComponentSequence |
+					unexpectedDataValue |
+					unexpectedParameter}
+	CODE			opcode-furnishChargingInformation}
+
 furnishChargingInformationV3 {PARAMETERS-BOUND : bound} OPERATION ::= {
 	ARGUMENT		FurnishChargingInformationArgV3 {bound}
 	RETURN RESULT	FALSE
@@ -548,6 +762,7 @@ furnishChargingInformationV3 {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}
 FurnishChargingInformationArgV3 {PARAMETERS-BOUND : bound} ::= FCIBillingChargingCharacteristics{bound}
 
 initialDPV1 OPERATION ::= {
@@ -564,6 +779,20 @@ initialDPV1 OPERATION ::= {
 		}
 	CODE			opcode-initialDP}
 
+initialDPV2 OPERATION ::= {
+	ARGUMENT		InitialDPArgV2
+	RETURN RESULT	FALSE
+	ERRORS {
+		missingCustomerRecord |
+		missingParameter |
+		systemFailure |
+		taskRefused |
+		unexpectedComponentSequence |
+		unexpectedDataValue |
+		unexpectedParameter
+		}
+	CODE			opcode-initialDP}
+
 initialDPV3 {PARAMETERS-BOUND : bound} OPERATION ::= {
 	ARGUMENT		InitialDPArgV3 {bound}
 	RETURN RESULT	FALSE
@@ -604,6 +833,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
+
+	}
+
 InitialDPArgV3 {PARAMETERS-BOUND : bound} ::= SEQUENCE {
 	serviceKey							[0] ServiceKey	,
 	calledPartyNumber					[2] CalledPartyNumber {bound}					OPTIONAL,
@@ -657,6 +916,14 @@ releaseCallV1 OPERATION ::= {
 	CODE			opcode-releaseCall
 }
 
+releaseCallV2 OPERATION ::= {
+	-- same as V1
+	ARGUMENT	ReleaseCallArgV1
+	RETURN RESULT	FALSE
+	ALWAYS RESPONDS	FALSE
+	CODE			opcode-releaseCall
+}
+
 releaseCallV3 {PARAMETERS-BOUND : bound} OPERATION ::= {
 	ARGUMENT		ReleaseCallArgV3 {bound}
 	RETURN RESULT	FALSE
@@ -683,6 +950,19 @@ requestReportBCSMEventV1 OPERATION ::= {
 	CODE			opcode-requestReportBCSMEvent
 }
 
+requestReportBCSMEventV2 OPERATION ::= {
+	ARGUMENT		RequestReportBCSMEventArgV2
+	RETURN RESULT	FALSE
+	ERRORS			{missingParameter |
+					systemFailure |
+					taskRefused |
+					unexpectedComponentSequence |
+					unexpectedDataValue |
+					unexpectedParameter |
+					unknownLegID}
+	CODE			opcode-requestReportBCSMEvent
+}
+ 
 requestReportBCSMEventV3 {PARAMETERS-BOUND : bound} OPERATION ::= {
 	ARGUMENT		RequestReportBCSMEventArgV3 {bound}
 	RETURN RESULT	FALSE
@@ -714,6 +994,12 @@ RequestReportBCSMEventArgV1 ::= SEQUENCE  {
 	...
 	}
 
+RequestReportBCSMEventArgV2 ::= SEQUENCE  {
+	bcsmEvents						[0] SEQUENCE SIZE (1..numOfBCSMEventsV1) OF BCSMEventV2,
+	extensions						[2] SEQUENCE SIZE (1..numOfExtensionsV1) OF ExtensionField																			OPTIONAL,
+	...
+	}
+
 RequestReportBCSMEventArgV3 {PARAMETERS-BOUND : bound} ::= SEQUENCE {
 	bcsmEvents	[0] SEQUENCE SIZE(1..bound.&numOfBCSMEvents) OF BCSMEvent,
 	extensions	[2] Extensions {bound} 	OPTIONAL,
@@ -721,6 +1007,16 @@ RequestReportBCSMEventArgV3 {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}
+
 resetTimerV3 {PARAMETERS-BOUND : bound} OPERATION ::= {
 	ARGUMENT		ResetTimerArgV3 {bound}
 	RETURN RESULT	FALSE
@@ -735,6 +1031,14 @@ resetTimerV3 {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,
+  	...
+	}
+
 ResetTimerArgV3 {PARAMETERS-BOUND : bound} ::= SEQUENCE {
 	timerID			[0] TimerID	DEFAULT tssf,
 	timervalue		[1] TimerValue,
@@ -742,6 +1046,19 @@ ResetTimerArgV3 {PARAMETERS-BOUND : bound} ::= SEQUENCE {
 	...
 	}
 
+sendChargingInformationV2 OPERATION ::= {
+	ARGUMENT		SendChargingInformationArgV2
+	RETURN RESULT	FALSE
+	ERRORS			{missingParameter |
+					unexpectedComponentSequence |
+					unexpectedParameter |
+					parameterOutOfRange |
+					systemFailure |
+					taskRefused |
+					unexpectedDataValue |
+					unknownLegID}
+	CODE			opcode-sendChargingInformation}
+
 sendChargingInformationV3 {PARAMETERS-BOUND : bound} OPERATION ::= {
 	ARGUMENT		SendChargingInformationArgV3 {bound}
 	RETURN RESULT	FALSE
@@ -761,6 +1078,14 @@ sendChargingInformationV3 {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,
+  	...
+}
+
 SendChargingInformationArgV3 {PARAMETERS-BOUND : bound}::= SEQUENCE {
 	sCIBillingChargingCharacteristics	[0] SCIBillingChargingCharacteristics {bound},
 	partyToCharge						[1] SendingSideID,
diff --git a/camel/phase3/CAP-gsmSSF-gsmSCF-pkgs-contracts-acs.asn b/camel/phase3/CAP-gsmSSF-gsmSCF-pkgs-contracts-acs.asn
index 7286ae3..b0109ac 100644
--- a/camel/phase3/CAP-gsmSSF-gsmSCF-pkgs-contracts-acs.asn
+++ b/camel/phase3/CAP-gsmSSF-gsmSCF-pkgs-contracts-acs.asn
@@ -30,32 +30,48 @@ FROM TCAPMessages tc-Messages
 FROM TC-Notation-Extensions tc-NotationExtensions
 
 	activityTestV1,
+	activityTestV2,
 	activityTestV3,
+	applyChargingV2,
 	applyChargingV3 {},
+	applyChargingReportV2,
 	applyChargingReportV3 {},
+	assistRequestInstructionsV2,
 	assistRequestInstructionsV3 {},
 	callGapV3 {},
 	callInformationReportV3 {},
 	callInformationRequestV3 {},
+	cancelV2,
 	cancelV3 ,
 	connectV1,
+	connectV2,
 	connectV3 {},
+	connectToResourceV2,
 	connectToResourceV3 {},
 	continueV1,
+	continueV2,
 	continueV3,
 	continueWithArgumentV3 {},
+	disconnectForwardConnectionV2,
 	disconnectForwardConnectionV3,
+	establishTemporaryConnectionV2,
 	establishTemporaryConnectionV3 {},
 	eventReportBCSMV1,
+	eventReportBCSMV2,
 	eventReportBCSMV3 {},
+	furnishChargingInformationV2,
 	furnishChargingInformationV3 {},
 	initialDPV1,
+	initialDPV2,
 	initialDPV3 {},
 	releaseCallV1,
+	releaseCallV2,
 	releaseCallV3 {},
 	requestReportBCSMEventV1,
+	requestReportBCSMEventV2,
 	requestReportBCSMEventV3 {},
 	resetTimerV3 {},
+	sendChargingInformationV2,
 	sendChargingInformationV3 {}
 FROM CAP-gsmSSF-gsmSCF-ops-args gsmSSF-gsmSCF-Operations
 
@@ -64,6 +80,7 @@ FROM CAP-gsmSSF-gsmSCF-ops-args gsmSSF-gsmSCF-Operations
 	specializedResourceReportV3
 FROM CAP-gsmSCF-gsmSRF-ops-args gsmSCF-gsmSRF-Operations
 
+	specializedResourceControlPackageV2,
 	specializedResourceControlPackageV3 {}
 FROM CAP-gsmSCF-gsmSRF-pkgs-contracts-acs gsmSCF-gsmSRF-Protocol
 
@@ -111,6 +128,13 @@ capssf-scfGenericACV1 APPLICATION-CONTEXT ::= {
 								gsmSSF-scfGenericAbstractSyntaxV3} 
 	APPLICATION CONTEXT NAME	id-ac-CAP-gsmSSF-scfGenericACV1}
 
+capssf-scfGenericACV2 APPLICATION-CONTEXT ::= {
+	CONTRACT					capSsfToScfGenericV2
+	DIALOGUE MODE				structured
+	ABSTRACT SYNTAXES			{dialogue-abstract-syntax |
+								gsmSSF-scfGenericAbstractSyntaxV3} 
+	APPLICATION CONTEXT NAME	id-ac-CAP-gsmSSF-scfGenericACV2}
+
 capssf-scfGenericACV3 APPLICATION-CONTEXT ::= {
 	CONTRACT					capSsfToScfGenericV3
 	DIALOGUE MODE				structured
@@ -118,6 +142,13 @@ capssf-scfGenericACV3 APPLICATION-CONTEXT ::= {
 								gsmSSF-scfGenericAbstractSyntaxV3} 
 	APPLICATION CONTEXT NAME	id-ac-CAP-gsmSSF-scfGenericACV3}
 
+capssf-scfAssistHandoffACV2 APPLICATION-CONTEXT ::= {
+	CONTRACT					capAssistHandoffssfToScfV2
+	DIALOGUE MODE				structured
+	ABSTRACT SYNTAXES			{dialogue-abstract-syntax |
+								assistHandoff-gsmSSF-scfAbstractSyntaxV3}
+	APPLICATION CONTEXT NAME	id-ac-CAP-gsmSSF-scfAssistHandoffACV2}
+
 capssf-scfAssistHandoffACV3 APPLICATION-CONTEXT ::= 	{
 	CONTRACT					capAssistHandoffssfToScfV3
 	DIALOGUE MODE				structured
@@ -133,6 +164,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}
+}
+
 capSsfToScfGenericV3 CONTRACT ::= {
 -- dialogue initiated by gsmSSF with InitialDP Operation
 	INITIATOR CONSUMER OF	
@@ -157,6 +207,16 @@ capSsfToScfGenericV3 CONTRACT ::= {
 	ID		id-CAPSsfToScfGenericV3
 	}
 
+capAssistHandoffssfToScfV2 CONTRACT ::= {
+	INITIATOR CONSUMER OF		{gsmSRF-scfActivationOfAssistPackageV2}
+	RESPONDER CONSUMER OF		{genericDisconnectResourcePackageV2 |
+						nonAssistedConnectionEstablishmentPackageV2 |
+						timerPackageV2 |
+						specializedResourceControlPackageV2 |
+						cancelPackageV2 |
+						activityTestPackageV2}
+}
+
 capAssistHandoffssfToScfV3 CONTRACT ::= {
 -- dialogue initiated by gsmSSF with AssistRequestInstructions
 	INITIATOR CONSUMER OF
@@ -175,50 +235,76 @@ capAssistHandoffssfToScfV3 CONTRACT ::= {
 -- Operation Packages
 scfActivationPackageV1 OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{initialDPV1}}
-
+scfActivationPackageV2 OPERATION-PACKAGE ::= {
+	CONSUMER INVOKES	{initialDPV2}}
 scfActivationPackageV3 {PARAMETERS-BOUND : bound} OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{initialDPV3 {bound}}
 	ID		id-package-scfActivationV3}
+gsmSRF-scfActivationOfAssistPackageV2 OPERATION-PACKAGE ::= {
+	CONSUMER INVOKES	{assistRequestInstructionsV2}
+	SUPPLIER INVOKES	{establishTemporaryConnectionV2}}
 gsmSRF-scfActivationOfAssistPackageV3 {PARAMETERS-BOUND : bound} OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{assistRequestInstructionsV3 {bound}}
 	ID		id-package-gsmSRF-scfActivationOfAssistV3}
+assistConnectionEstablishmentPackageV2 OPERATION-PACKAGE ::= {
+	CONSUMER INVOKES	{establishTemporaryConnectionV2}}
 assistConnectionEstablishmentPackageV3 {PARAMETERS-BOUND : bound} OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{establishTemporaryConnectionV3 {bound}}
 	ID		id-package-assistConnectionEstablishmentV3}
+genericDisconnectResourcePackageV2 OPERATION-PACKAGE ::= {
+	CONSUMER INVOKES	{disconnectForwardConnectionV2}}
 genericDisconnectResourcePackageV3  OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{disconnectForwardConnectionV3}
 	ID		id-package-genericDisconnectResourceV3}
+nonAssistedConnectionEstablishmentPackageV2 OPERATION-PACKAGE ::= {
+	CONSUMER INVOKES	{connectToResourceV2}}
 nonAssistedConnectionEstablishmentPackageV3 {PARAMETERS-BOUND : bound} OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{connectToResourceV3 {bound}}
 	ID		id-package-nonAssistedConnectionEstablishmentV3}
 connectPackageV1 OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{connectV1}}
+connectPackageV2 OPERATION-PACKAGE ::= {
+	CONSUMER INVOKES	{connectV2}}
 connectPackageV3 {PARAMETERS-BOUND : bound} OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{connectV3 {bound}}
 	ID		id-package-connectV3}
 callHandlingPackageV1 OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{releaseCallV1}}
+callHandlingPackageV2 OPERATION-PACKAGE ::= {
+	CONSUMER INVOKES	{releaseCallV2}}
 callHandlingPackageV3 {PARAMETERS-BOUND : bound} OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{releaseCallV3 {bound}}
 	ID		id-package-callHandlingV3}
 bcsmEventHandlingPackageV1 OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{eventReportBCSMV1}
 	SUPPLIER INVOKES	{requestReportBCSMEventV1}}
+bcsmEventHandlingPackageV2 OPERATION-PACKAGE ::= {
+	CONSUMER INVOKES	{eventReportBCSMV2}
+	SUPPLIER INVOKES	{requestReportBCSMEventV2}}
 bcsmEventHandlingPackageV3 {PARAMETERS-BOUND : bound} OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{requestReportBCSMEventV3 {bound}}
 	SUPPLIER INVOKES	{eventReportBCSMV3 {bound}}
 	ID		id-package-bcsmEventHandlingV3}
 ssfCallProcessingPackageV1 OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{continueV1}}
+ssfCallProcessingPackageV2 OPERATION-PACKAGE ::= {
+	CONSUMER INVOKES	{continueV2}}
 ssfCallProcessingPackageV3 {PARAMETERS-BOUND : bound} OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{continueWithArgumentV3 {bound} | continueV3}
 	ID		id-package-ssfCallProcessingV3}
+timerPackageV2 OPERATION-PACKAGE ::= {
+	CONSUMER INVOKES	{resetTimerV2}}
 timerPackageV3 {PARAMETERS-BOUND : bound} OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{resetTimerV3 {bound}}
 	ID		id-package-timerV3}
+billingPackageV2 OPERATION-PACKAGE ::= {
+	CONSUMER INVOKES	{furnishChargingInformationV2}}
 billingPackageV3 {PARAMETERS-BOUND : bound} OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{furnishChargingInformationV3 {bound}}
 	ID		id-package-billingV3}
+chargingPackageV2 OPERATION-PACKAGE ::= {
+	CONSUMER INVOKES	{applyChargingV2}
+	SUPPLIER INVOKES	{applyChargingReportV2}}
 chargingPackageV3 {PARAMETERS-BOUND : bound} OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{applyChargingV3 {bound}}
 	SUPPLIER INVOKES	{applyChargingReportV3 {bound}}
@@ -226,18 +312,28 @@ chargingPackageV3 {PARAMETERS-BOUND : bound} OPERATION-PACKAGE ::= {
 trafficManagementPackageV3 {PARAMETERS-BOUND : bound} OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES {callGapV3 {bound}}
 	ID id-package-trafficManagementV3}
+callReportPackageV2 OPERATION-PACKAGE ::= {
+	CONSUMER INVOKES	{callInformationRequestV2}
+	SUPPLIER INVOKES	{callInformationReportV2}}
 callReportPackageV3 {PARAMETERS-BOUND : bound} OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{callInformationRequestV3 {bound}}
 	SUPPLIER INVOKES	{callInformationReportV3 {bound}}
 	ID		id-package-callReportV3}
+signallingControlPackageV2 OPERATION-PACKAGE ::= {
+	CONSUMER INVOKES	{sendChargingInformationV2}}
 signallingControlPackageV3 {PARAMETERS-BOUND : bound} OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{sendChargingInformationV3 {bound}}
 	ID		id-package-signallingControlV3}
 activityTestPackageV1 OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{activityTestV1}}
+activityTestPackageV2 OPERATION-PACKAGE ::= {
+	CONSUMER INVOKES	{activityTestV2}
+}
 activityTestPackageV3 OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{activityTestV3}
 	ID		id-package-activityTestV3}
+cancelPackageV2 OPERATION-PACKAGE ::= {
+	CONSUMER INVOKES	{cancelV2}}
 cancelPackageV3  OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{cancelV3 }
 	ID		id-package-cancelV3}
diff --git a/camel/phase3/CAP-object-identifiers.asn b/camel/phase3/CAP-object-identifiers.asn
index a531734..085cda4 100644
--- a/camel/phase3/CAP-object-identifiers.asn
+++ b/camel/phase3/CAP-object-identifiers.asn
@@ -100,10 +100,13 @@ id-rosObject-gsmSRFV3							OBJECT IDENTIFIER ::= {id-rosObjectV3 6}
 
 -- 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-scfGenericACV3				OBJECT IDENTIFIER ::= {id-acEV3 4}
+id-ac-CAP-gsmSSF-scfAssistHandoffACV2				OBJECT IDENTIFIER ::= {id-GSM-ac cap-assist-handoff-gsmssf-to-gsmscf(51) version2(1)}
 id-ac-CAP-gsmSSF-scfAssistHandoffACV3			OBJECT IDENTIFIER ::= {id-acEV3 6}
 
 -- gsmSRF/gsmSCF AC
+id-ac-gsmSRF-gsmSCFV2						OBJECT IDENTIFIER ::= {id-GSM-ac cap-gsmSRF-to-gsmscf(52) version2(1)}
 id-ac-gsmSRF-gsmSCFV3							OBJECT IDENTIFIER ::= {id-acV3 14}
 
 -- gprsSSF/gsmSCF AC