diff --git a/demo/DIAMETER_Types.ttcn b/demo/DIAMETER_Types.ttcn
index 178e07d1673f800d424e6e1e28a474f79f6421e6..bd733eee4192a7637e448f008513da40d9b695d6 100644
--- a/demo/DIAMETER_Types.ttcn
+++ b/demo/DIAMETER_Types.ttcn
@@ -40,7 +40,7 @@ module DIAMETER_Types {
 //
 //  File:               BaseTypes_IETF_RFC3588.ddf
 //  Description:	DDF for the Diameter base types
-//  Rev:                R30C
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/doc/DIAMETER_ProtocolModule_Generator_CNL113462_1551.doc b/doc/DIAMETER_ProtocolModule_Generator_CNL113462_1551.doc
index e5341a7e62a1deff96d3ed469b1935874ddf8c61..c73ecab1dbf0813c58496e9792dbf7200e5d1b52 100644
Binary files a/doc/DIAMETER_ProtocolModule_Generator_CNL113462_1551.doc and b/doc/DIAMETER_ProtocolModule_Generator_CNL113462_1551.doc differ
diff --git a/doc/DIAMETER_ProtocolModule_Generator_CNL113462_PRI.doc b/doc/DIAMETER_ProtocolModule_Generator_CNL113462_PRI.doc
index 016c3c5cfb7b8fe0aa32e6b84f34c2075b71ae27..3bd56d64c6dbe5781cc0dd46d1e53a0a52205c2c 100644
Binary files a/doc/DIAMETER_ProtocolModule_Generator_CNL113462_PRI.doc and b/doc/DIAMETER_ProtocolModule_Generator_CNL113462_PRI.doc differ
diff --git a/src/AAAInterface_3GPP_TS29272_940.ddf b/src/AAAInterface_3GPP_TS29272_940.ddf
index 3cae5bbf27182c2ad89ffcc6968cd4137eb665ac..e0c3a9931babe5e01a813f10d862a5213499bf2f 100644
--- a/src/AAAInterface_3GPP_TS29272_940.ddf
+++ b/src/AAAInterface_3GPP_TS29272_940.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               AAAInterface_3GPP_TS29272_940.ddf
 //  Description:        DDF for S6a/S6d and S13 Interfaces according to 3GPP TS 29.272 V9.4.0
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/AAAInterface_3GPP_TS29272_950.ddf b/src/AAAInterface_3GPP_TS29272_950.ddf
index bfc352918da3afa323d21a4b2407538e90bf2894..bbf49a712492c0e69b2d3c2a9098e88cf74226c4 100644
--- a/src/AAAInterface_3GPP_TS29272_950.ddf
+++ b/src/AAAInterface_3GPP_TS29272_950.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               AAAInterface_3GPP_TS29272_950.ddf
 //  Description:        DDF for S6a/S6d and S13 Interfaces according to 3GPP TS 29.272 V9.5.0
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 
 
diff --git a/src/AAAInterface_3GPP_TS29272_970.ddf b/src/AAAInterface_3GPP_TS29272_970.ddf
index d6f33603116c9b646d1f4f94190bb7954f3a8b1f..bbb353a40f94113267826f2c928eec3f6e3d820c 100644
--- a/src/AAAInterface_3GPP_TS29272_970.ddf
+++ b/src/AAAInterface_3GPP_TS29272_970.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               AAAInterface_3GPP_TS29272_970.ddf
 //  Description:        DDF for S6a/S6d and S13 Interfaces according to 3GPP TS 29.272 V9.7.0
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 
 
diff --git a/src/AAAInterface_3GPP_TS29272_a30.ddf b/src/AAAInterface_3GPP_TS29272_a30.ddf
index c57e240f9ec24b8d0585ca0cbbd2325c47cd51d5..421a71068be13ebd652079f26795dfac62f9d0bb 100644
--- a/src/AAAInterface_3GPP_TS29272_a30.ddf
+++ b/src/AAAInterface_3GPP_TS29272_a30.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               AAAInterface_3GPP_TS29272_a30.ddf
 //  Description:        DDF for S6a/S6d and S13 Interfaces according to 3GPP TS 29.272 V10.3.0
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 
 
diff --git a/src/AAAInterface_3GPP_TS29272_a60.ddf b/src/AAAInterface_3GPP_TS29272_a60.ddf
index 8446bc4f754ede4261b0012b42567d0e64dbc370..fc91d0e04b1fd5ca49e30bab822920d5d13927dd 100644
--- a/src/AAAInterface_3GPP_TS29272_a60.ddf
+++ b/src/AAAInterface_3GPP_TS29272_a60.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               AAAInterface_3GPP_TS29272_a60.ddf
 //  Description:        DDF for S6a/S6d and S13 Interfaces according to 3GPP TS 29.272 V10.6.0
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 
 
diff --git a/src/AAAInterface_3GPP_TS29272_b60.ddf b/src/AAAInterface_3GPP_TS29272_b60.ddf
index 6043494fca07ed4e40c324fc6413299a32d69c70..00bfd6fb63a6152f6a31aa7b5c9cd28fa6a6f59f 100644
--- a/src/AAAInterface_3GPP_TS29272_b60.ddf
+++ b/src/AAAInterface_3GPP_TS29272_b60.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               AAAInterface_3GPP_TS29272_b60.ddf
 //  Description:        DDF for S6a/S6d and S13 Interfaces according to 3GPP TS 29.272 V11.6.0
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 
 
diff --git a/src/AAAInterface_3GPP_TS29272_bd0.ddf b/src/AAAInterface_3GPP_TS29272_bd0.ddf
new file mode 100644
index 0000000000000000000000000000000000000000..f0f21782955e1454fe5cc6939fdeeaf487eac043
--- /dev/null
+++ b/src/AAAInterface_3GPP_TS29272_bd0.ddf
@@ -0,0 +1,1067 @@
+/******************************************************************************
+* Copyright (c) 2004, 2015  Ericsson AB
+* All rights reserved. This program and the accompanying materials
+* are made available under the terms of the Eclipse Public License v1.0
+* which accompanies this distribution, and is available at
+* http://www.eclipse.org/legal/epl-v10.html
+*
+* Contributors:
+*   Timea Moder - initial implementation and initial documentation
+******************************************************************************/
+//
+//  File:               AAAInterface_3GPP_TS29272_bd0.ddf
+//  Description:        DDF for S6a/S6d and S13 Interfaces according to 3GPP TS 29.272 V11.13.0
+//  Rev:                R34A
+//  Prodnr:             CNL 113 462
+
+
+// APPLICATION-NAME: AAA
+// APPLICATION-REVISION: V11_13_0
+
+// AVP implementations according to: 
+// 3GPP TS 29.272 V11.13.0 - Evolved Packet System (EPS); Mobility Management Entity (MME) and Serving GPRS Support Node (SGSN) related interfaces based on Diameter protocol
+
+// 3GPP TS 29.272 V11.13.0
+// 7.2.2
+type enumerated Command_Code 
+{
+  Update_Location            (316),
+  Cancel_Location            (317),
+  Authentication_Information (318),
+  Insert_Subscriber_Data     (319),
+  Delete_Subscriber_Data     (320),
+  Purge_UE                   (321),
+  Reset                      (322),
+  Notify                     (323),
+  ME_Identity_Check          (324),
+  Update_VCSG_Location   (8388638),
+  Cancel_VCSG_Location   (8388642)
+}
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.2
+// AVP: Subscription-Data (1400) 3GPP (10415)
+type AVP_Grouped Subscription_Data;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.3
+// AVP: Terminal-Information (1401) 3GPP (10415)
+type AVP_Grouped Terminal_Information;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.4
+// AVP: IMEI (1402) 3GPP (10415)
+type AVP_UTF8String IMEI;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.5
+// AVP: Software-Version (1403) 3GPP (10415)
+type AVP_UTF8String Software_Version;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.77
+// AVP: QoS-Subscribed (1404) 3GPP (10415)
+type AVP_OctetString QoS_Subscribed;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.7
+// AVP: ULR-Flags (1405) 3GPP (10415)
+type AVP_Unsigned32 ULR_Flags;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.8
+// AVP: ULA-Flags (1406) 3GPP (10415)
+type AVP_Unsigned32 ULA_Flags;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.9
+// AVP: Visited-PLMN-Id (1407) 3GPP (10415) 
+type AVP_OctetString Visited_PLMN_Id;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.11
+// AVP: Requested-EUTRAN-Authentication-Info (1408) 3GPP (10415)
+type AVP_Grouped Requested_EUTRAN_Authentication_Info;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.12
+// AVP: Requested-UTRAN-GERAN-Authentication-Info (1409) 3GPP (10415)
+type AVP_Grouped Requested_UTRAN_GERAN_Authentication_Info;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.14
+// AVP: Number-Of-Requested-Vectors (1410) 3GPP (10415)
+type AVP_Unsigned32 Number_Of_Requested_Vectors;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.15
+// AVP: Re-Synchronization-Info (1411) 3GPP (10415)
+type AVP_OctetString Re_Synchronization_Info;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.16
+// AVP: Immediate-Response-Preferred (1412) 3GPP (10415)
+type AVP_Unsigned32 Immediate_Response_Preferred;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.17
+// AVP: Authentication-Info (1413) 3GPP (10415)
+type AVP_Grouped Authentication_Info;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.18
+// AVP: E-UTRAN-Vector (1414) 3GPP (10415)
+type AVP_Grouped E_UTRAN_Vector;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.19
+// AVP: UTRAN-Vector (1415) 3GPP (10415)
+type AVP_Grouped UTRAN_Vector;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.20
+// AVP: GERAN-Vector (1416) 3GPP (10415)
+type AVP_Grouped GERAN_Vector;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.21
+// AVP: Network-Access-Mode (1417) 3GPP (10415)
+type enumerated Network_Access_Mode
+{
+  PACKET_AND_CIRCUIT (0),
+  Reserved           (1),
+  ONLY_PACKET        (2)
+}
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.22
+// AVP: HPLMN-ODB (1418) 3GPP (10415)
+type AVP_Unsigned32 HPLMN_ODB;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.23
+// AVP: Item-Number (1419) 3GPP (10415)
+type AVP_Unsigned32 Item_Number;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.24
+// AVP: Cancellation-Type (1420) 3GPP (10415)
+type enumerated Cancellation_Type
+{
+  MME_UPDATE_PROCEDURE     (0),
+  SGSN_UPDATE_PROCEDURE    (1),
+  SUBSCRIPTION_WITHDRAWAL  (2),
+  UPDATE_PROCEDURE_IWF     (3),
+  INITIAL_ATTACH_PROCEDURE (4)
+}
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.25
+// AVP: DSR-Flags (1421) 3GPP (10415)
+type AVP_Unsigned32 DSR_Flags;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.26
+// AVP: DSA-Flags (1422) 3GPP (10415)
+type AVP_Unsigned32 DSA_Flags;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.27
+// AVP: Context-Identifier (1423) 3GPP (10415)
+type AVP_Unsigned32 Context_Identifier;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.29
+// AVP: Subscriber-Status (1424) 3GPP (10415)
+type enumerated Subscriber_Status
+{
+  SERVICE_GRANTED             (0),
+  OPERATOR_DETERMINED_BARRING (1)
+}
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.30
+// AVP: Operator-Determined-Barring (1425) 3GPP (10415)
+type AVP_Unsigned32 Operator_Determined_Barring;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.31
+// AVP: Access-Restriction-Data (1426) 3GPP (10415)
+type AVP_Unsigned32 Access_Restriction_Data;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.32
+// AVP: APN-OI-Replacement (1427) 3GPP (10415)
+type AVP_UTF8String APN_OI_Replacement;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.33
+// AVP: All-APN-Configurations-Included-Indicator (1428) 3GPP (10415)
+type enumerated All_APN_Configurations_Included_Indicator
+{
+  All_APN_CONFIGURATIONS_INCLUDED            (0),
+  MODIFIED_ADDED_APN_CONFIGURATIONS_INCLUDED (1)
+}
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.34
+// AVP: APN-Configuration-Profile (1429) 3GPP (10415)
+type AVP_Grouped APN_Configuration_Profile;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.35
+// AVP: APN-Configuration (1430) 3GPP (10415)
+type AVP_Grouped APN_Configuration;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.37
+// AVP: EPS-Subscribed-QoS-Profile (1431) 3GPP (10415)
+type AVP_Grouped EPS_Subscribed_QoS_Profile;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.38
+// AVP: VPLMN-Dynamic-Address-Allowed (1432) 3GPP (10415)
+type enumerated VPLMN_Dynamic_Address_Allowed
+{
+  NOTALLOWED (0),
+  ALLOWED    (1)  
+}
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.39
+// AVP: STN-SR (1433) 3GPP (10415)
+type AVP_OctetString STN_SR;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.83
+// AVP: Alert-Reason (1434) 3GPP (10415)
+type enumerated Alert_Reason;
+{
+  UE_PRESENT          (0),
+  UE_MEMORY_AVAILABLE (1)
+}
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.41
+// AVP: AMBR (1435) 3GPP (10415)
+type AVP_Grouped AMBR;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.78
+// AVP: CSG-Subscription-Data (1436) 3GPP (10415)
+type AVP_Grouped CSG_Subscription_Data;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.79
+// AVP: CSG-Id (1437) 3GPP (10415)
+type AVP_Unsigned32 CSG_Id;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.44
+// AVP: PDN-GW-Allocation-Type (1438) 3GPP (10415)
+type enumerated PDN_GW_Allocation_Type
+{
+  STATIC  (0),
+  DYNAMIC (1)
+}
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.80
+// AVP: Expiration-Date (1439) 3GPP (10415)
+type AVP_Time Expiration_Date;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.46
+// AVP: RAT-Frequency-Selection-Priority-ID (1440) 3GPP (10415)
+type AVP_Unsigned32 RAT_Frequency_Selection_Priority_ID;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.47
+// AVP: IDA-Flags (1441) 3GPP (10415)
+type AVP_Unsigned32 IDA_Flags;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.48
+// AVP: PUA-Flags (1442) 3GPP (10415)
+type AVP_Unsigned32 PUA_Flags;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.49
+// AVP: NOR-Flags (1443) 3GPP (10415)
+type AVP_Unsigned32 NOR_Flags;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.50
+// AVP: User-Id (1444) 3GPP (10415)
+type AVP_UTF8String User_Id;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.51
+// AVP: Equipment-Status (1445) 3GPP (10415)
+type enumerated Equipment_Status
+{
+  WHITELISTED (0),
+  BLACKLISTED (1),
+  GREYLISTED  (2)
+}
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.52
+// AVP: Regional-Subscription-Zone-Code (1446) 3GPP (10415)
+type AVP_OctetString Regional_Subscription_Zone_Code;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.53
+// AVP: RAND (1447) 3GPP (10415)
+type AVP_OctetString RAND;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.54
+// AVP: XRES (1448) 3GPP (10415)
+type AVP_OctetString XRES;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.55
+// AVP: AUTN (1449) 3GPP (10415)
+type AVP_OctetString AUTN;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.56
+// AVP: KASME (1450) 3GPP (10415)
+type AVP_OctetString KASME;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.98
+// AVP: Trace-Collection-Entity (1452) 3GPP (10415)
+type AVP_Address Trace_Collection_Entity;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.59
+// AVP: Kc (1453) 3GPP (10415)
+type AVP_OctetString Kc;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.60
+// AVP: SRES (1454) 3GPP (10415)
+type AVP_OctetString SRES;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.62
+// AVP: PDN-Type (1456) 3GPP (10415)
+type enumerated PDN_Type;
+{
+  IPv4 (0),
+  IPv6 (1),
+  IPv4v6 (2),
+  IPv4_OR_IPv6 (3)  
+}
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.81
+// AVP: Roaming-Restricted-Due-To-Unsupported-Feature (1457) 3GPP (10415)
+type enumerated Roaming_Restricted_Due_To_Unsupported_Feature
+{
+  Roaming_Restricted_Due_To_Unsupported_Feature (0)
+}
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.63
+// AVP: Trace-Data (1458) 3GPP (10415)
+type AVP_Grouped Trace_Data;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.64
+// AVP: Trace-Reference (1459) 3GPP (10415)
+type AVP_OctetString Trace_Reference;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.67
+// AVP: Trace-Depth (1462) 3GPP (10415)
+// FS 3.3.2.10
+type AVP_Unsigned32 Trace_Depth;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.68
+// AVP: Trace-NE-Type-List (1463) 3GPP (10415)
+type AVP_OctetString Trace_NE_Type_List;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.69
+// AVP: Trace-Interface-List (1464) 3GPP (10415)
+type AVP_OctetString Trace_Interface_List;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.70
+// AVP: Trace-Event-List (1465) 3GPP (10415)
+type AVP_OctetString Trace_Event_List;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.71
+// AVP: OMC-Id (1466) 3GPP (10415)
+type AVP_OctetString OMC_Id;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.72
+// AVP: GPRS-Subscription-Data (1467) 3GPP (10415)
+type AVP_Grouped GPRS_Subscription_Data;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.73
+// AVP: Complete-Data-List-Included-Indicator (1468) 3GPP (10415)
+type enumerated Complete_Data_List_Included_Indicator
+{
+  All_PDP_CONTEXTS_INCLUDED            (0),
+  MODIFIED_ADDED_PDP_CONTEXTS_INCLUDED (1)
+}
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.74
+// AVP: PDP-Context (1469) 3GPP (10415)
+type AVP_Grouped PDP_Context;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.75
+// AVP: PDP-Type (1470) 3GPP (10415)
+type AVP_OctetString PDP_Type;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.6
+// AVP: 3GPP2-MEID (1471) 3GPP (10415)
+type AVP_OctetString 3GPP2_MEID;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.82
+// AVP: Specific-APN-Info (1472) 3GPP (10415)
+type AVP_Grouped Specific_APN_Info;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.84
+// AVP: LCS-Info (1473) 3GPP (10415)
+type AVP_Grouped LCS_Info;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.85
+// AVP: GMLC-Number (1474) 3GPP (10415)
+type AVP_OctetString GMLC_Number;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.86
+// AVP: LCS-PrivacyException (1475) 3GPP (10415)
+type AVP_Grouped LCS_PrivacyException;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.87
+// AVP: SS-Code (1476) 3GPP (10415)
+type AVP_OctetString SS_Code;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.88
+// AVP: SS-Status (1477) 3GPP (10415)
+type AVP_OctetString SS_Status;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.89
+// AVP: Notification-To-UE-User (1478) 3GPP (10415)
+type enumerated Notification_To_UE_User
+{
+  NOTIFY_LOCATION_ALLOWED                             (0),
+  NOTIFYANDVERIFY_LOCATION_ALLOWED_IF_NO_RESPONSE     (1),
+  NOTIFYANDVERIFY_LOCATION_NOT_ALLOWED_IF_NO_RESPONSE (2),
+  LOCATION_NOT_ALLOWED                                (3)
+}
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.90
+// AVP: External-Client (1479) 3GPP (10415)
+type AVP_Grouped External_Client;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.91
+// AVP: Client-Identity (1480) 3GPP (10415)
+type AVP_OctetString Client_Identity;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.92
+// AVP: GMLC-Restriction (1481) 3GPP (10415)
+type enumerated GMLC_Restriction
+{
+  GMLC_LIST    (0),
+  HOME_COUNTRY (1)
+}
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.93
+// AVP: PLMN-Client (1482) 3GPP (10415)
+type enumerated PLMN_Client
+{
+  BROADCAST_SERVICE            (0),
+  O_AND_M_HPLMN                (1),
+  O_AND_M_VPLMN                (2),
+  ANONYMOUS_LOCATION           (3),
+  TARGET_UE_SUBSCRIBED_SERVICE (4)
+}
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.94
+// AVP: Service-Type (1483) 3GPP (10415)
+type AVP_Grouped Service_Type;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.95
+// AVP: ServiceTypeIdentity (1484) 3GPP (10415)
+type AVP_Unsigned32 ServiceTypeIdentity;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.96
+// AVP: MO-LR (1485) 3GPP (10415)
+type AVP_Grouped MO_LR;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.99
+// AVP: Teleservice-List (1486) 3GPP (10415)
+type AVP_Grouped Teleservice_List;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.100
+// AVP: TS-Code (1487) 3GPP (10415)
+type AVP_OctetString TS_Code;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.101
+// AVP: Call-Barring-Info (1488) 3GPP (10415)
+type AVP_Grouped Call_Barring_Info;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.102
+// AVP: SGSN-Number (1489) 3GPP (10415)
+type AVP_OctetString SGSN_Number;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.103
+// AVP: IDR-Flags (1490) 3GPP (10415)
+type AVP_Unsigned32 IDR_Flags;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.104
+// AVP: ICS-Indicator (1491) 3GPP (10415)
+type enumerated ICS_Indicator
+{
+  FALSE (0),
+  TRUE  (1)
+}
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.106
+// AVP: IMS-Voice-Over-PS-Sessions-Supported (1492) 3GPP (10415)
+type enumerated IMS_Voice_Over_PS_Sessions_Supported
+{
+  NOT_SUPPORTED (0),
+  SUPPORTED     (1)
+}
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.107
+// AVP: Homogeneous-Support-of-IMS-Voice-Over-PS-Sessions (1493) 3GPP (10415)
+type enumerated Homogeneous_Support_of_IMS_Voice_Over_PS_Sessions
+{
+  NOT_SUPPORTED (0),
+  SUPPORTED     (1)
+}
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.108
+// AVP: Last-UE-Activity-Time (1494) 3GPP (10415)
+type AVP_Time Last_UE_Activity_Time;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.110
+// AVP: EPS-User-State (1495) 3GPP (10415)
+type AVP_Grouped EPS_User_State;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.111
+// AVP: EPS-Location-Information (1496) 3GPP (10415)
+type AVP_Grouped EPS_Location_Information;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.112
+// AVP: MME-User-State (1497) 3GPP (10415)
+type AVP_Grouped MME_User_State;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.113
+// AVP: SGSN-User-State (1498) 3GPP (10415)
+type AVP_Grouped SGSN_User_State;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.114
+// AVP: User-State (1499) 3GPP (10415)
+type enumerated User_State
+{
+  DETACHED                           (0),
+  ATTACHED_NOT_REACHABLE_FOR_PAGING  (1),
+  ATTACHED_REACHABLE_FOR_PAGING      (2),
+  CONNECTED_NOT_REACHABLE_FOR_PAGING (3),
+  CONNECTED_REACHABLE_FOR_PAGING     (4),
+  NETWORK_DETERMINED_NOT_REACHABLE   (5)
+}
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.115
+// AVP: MME-Location-Information (1600) 3GPP (10415)
+type AVP_Grouped MME_Location_Information;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.116
+// AVP: SGSN-Location-Information (1601) 3GPP (10415)
+type AVP_Grouped SGSN_Location_Information;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.117
+// AVP: E-UTRAN-Cell-Global-Identity (1602) 3GPP (10415)
+type AVP_OctetString E_UTRAN_Cell_Global_Identity;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.118
+// AVP: Tracking-Area-Identity (1603) 3GPP (10415)
+type AVP_OctetString Tracking_Area_Identity;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.119
+// AVP: Cell-Global-Identity (1604) 3GPP (10415)
+type AVP_OctetString Cell_Global_Identity;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.120
+// AVP: Routing-Area-Identity (1605) 3GPP (10415)
+type AVP_OctetString Routing_Area_Identity;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.121
+// AVP: Location-Area-Identity (1606) 3GPP (10415)
+type AVP_OctetString Location_Area_Identity;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.122
+// AVP: Service-Area-Identity (1607) 3GPP (10415)
+type AVP_OctetString Service_Area_Identity;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.123
+// AVP: Geographical-Information (1608) 3GPP (10415)
+type AVP_OctetString Geographical_Information;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.124
+// AVP: Geodetic-Information (1609) 3GPP (10415)
+type AVP_OctetString Geodetic_Information;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.125
+// AVP: Current-Location-Retrieved (1610) 3GPP (10415)
+type enumerated Current_Location_Retrieved
+{
+  ACTIVE_LOCATION_RETRIEVAL (0)
+}
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.126
+// AVP: Age-Of-Location-Information (1611) 3GPP (10415)
+type AVP_Unsigned32 Age_Of_Location_Information;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.127
+// AVP: Active-APN (1612) 3GPP (10415)
+type AVP_Grouped Active_APN;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.128
+// AVP: Error-Diagnostic (1614) 3GPP (10415)
+type enumerated Error_Diagnostic
+{
+  GPRS_DATA_SUBSCRIBED    (0),
+  NO_GPRS_DATA_SUBSCRIBED (1),
+  ODB_ALL_APN (2),
+  ODB_HPLMN_APN (3),
+  ODB_VPLMN_APN (4)
+}
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.129
+// AVP: Ext-PDP-Address (1621) 3GPP (10415)
+type AVP_Address Ext_PDP_Address;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.130
+// AVP: UE-SRVCC-Capability (1615) 3GPP (10415)
+type enumerated UE_SRVCC_Capability
+{
+  UE_SRVCC_NOT_SUPPORTED	(0),
+  UE_SRVCC_SUPPORTED	 	(1)
+}
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.131
+// AVP: MPS-Priority (1616) 3GPP (10415)
+type AVP_Unsigned32 MPS_Priority;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.132
+// AVP: VPLMN-LIPA-Allowed (1617) 3GPP (10415)
+type enumerated VPLMN_LIPA_Allowed
+{
+  LIPA_NOTALLOWED (0),
+  LIPA_ALLOWED (1)
+}
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.133
+// AVP: LIPA-Permission (1618) 3GPP (10415)
+type enumerated LIPA_Permission
+{
+  LIPA_PROHIBITED (0),
+  LIPA_ONLY (1),
+  LIPA_CONDITIONAL (2)
+}
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.134
+// AVP: Subscribed-Periodic-RAU-TAU-Timer (1619) 3GPP (10415)
+type AVP_Unsigned32 Subscribed_Periodic_RAU_TAU_Timer;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.75A
+// AVP: Ext-PDP-Type (1620) 3GPP (10415)
+type AVP_OctetString Ext_PDP_Type;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.135
+// AVP: SIPTO-Permission (1613) 3GPP (10415)
+type enumerated SIPTO_Permission
+{
+  SIPTO_ALLOWED    (0),
+  SIPTO_NOTALLOWED (1)
+}
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.136
+// AVP: MDT-Configuration (1622) 3GPP (10415)
+type AVP_Grouped MDT_Configuration;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.137
+// AVP: Job-Type (1623) 3GPP (10415)
+type enumerated Job_Type 
+{
+  IMMEDIATE_MDT_ONLY 		(0),
+  LOGGED_MDT_ONLY 		(1),
+  TRACE_ONLY 			(2),
+  IMMEDIATE_MDT_AND_TRACE 	(3)
+}
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.138
+// AVP: Area-Scope (1624) 3GPP (10415)
+type AVP_Grouped Area_Scope;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.139
+// AVP: List-Of-Measurements (1625) 3GPP (10415)
+type AVP_Unsigned32 List_Of_Measurements;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.140
+// AVP: Reporting-Trigger (1626) 3GPP (10415)
+type AVP_Unsigned32 Reporting_Trigger;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.141
+// AVP: Report-Interval (1627) 3GPP (10415)
+type enumerated Report_Interval
+{
+  RI_UMTS_250ms		(0), 
+  RI_UMTS_500ms		(1), 
+  RI_UMTS_1000ms 	(2), 
+  RI_UMTS_2000ms	(3), 
+  RI_UMTS_3000ms 	(4),
+  RI_UMTS_4000ms 	(5), 
+  RI_UMTS_6000ms 	(6), 
+  RI_UMTS_8000ms 	(7), 
+  RI_UMTS_12000ms 	(8), 
+  RI_UMTS_16000ms	(9), 
+  RI_UMTS_20000ms 	(10), 
+  RI_UMTS_24000ms 	(11), 
+  RI_UMTS_28000ms	(12), 
+  RI_UMTS_32000ms 	(13), 
+  RI_UMTS_64000ms 	(14),
+  RI_LTE_120ms		(15), 
+  RI_LTE_240ms		(16), 
+  RI_LTE_480ms 		(17), 
+  RI_LTE_640ms 		(18), 
+  RI_LTE_1024ms 	(19), 
+  RI_LTE_2048ms 	(20), 
+  RI_LTE_5120ms 	(21), 
+  RI_LTE_10240ms 	(22), 
+  RI_LTE_1min 		(23), 
+  RI_LTE_6min 		(24), 
+  RI_LTE_12min 		(25), 
+  RI_LTE_30min 		(26), 
+  RI_LTE_60min 		(27)
+}
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.142
+// AVP: Report-Amount (1628) 3GPP (10415)
+type enumerated Report_Amount 
+{
+  ONE 		(0), 
+  TWO 		(1),
+  FOUR 		(2), 
+  EIGHT 	(3), 
+  SIXTEEN 	(4),
+  THIRTYTWO	(5),
+  SIXTYFOUR 	(6),
+  INFINITY_AMOUNT	(7)
+}
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.143
+// AVP: Event-Threshold-RSRP (1629) 3GPP (10415)
+type AVP_Unsigned32 Event_Threshold_RSRP;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.144
+// AVP: Event-Threshold-RSRQ (1630) 3GPP (10415)
+type AVP_Unsigned32 Event_Threshold_RSRQ;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.145
+// AVP: Logging-Interval (1631) 3GPP (10415)
+type enumerated Logging_Interval
+{
+  LI_128	(0),
+  LI_256	(1), 
+  LI_512	(2), 
+  LI_1024	(3),
+  LI_2048	(4), 
+  LI_3072	(5),
+  LI_4096	(6), 
+  LI_6144	(7)
+}
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.146
+// AVP: Logging-Duration (1632) 3GPP (10415)
+type enumerated Logging_Duration
+{
+  LD_600_SEC  (0), 
+  LD_1200_SEC (1), 
+  LD_2400_SEC (2), 
+  LD_3600_SEC (3), 
+  LD_5400_SEC (4), 
+  LD_7200_SEC (5)
+}
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.147
+// AVP: Relay-Node-Indicator (1633) 3GPP (10415)
+type enumerated Relay_Node_Indicator
+{
+  NOT_RELAY_NODE (0),
+  RELAY_NODE	 (1)
+}
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.148
+// AVP: MDT-User-Consent (1634) 3GPP (10415)
+type enumerated MDT_User_Consent 
+{
+  CONSENT_NOT_GIVEN 	(0),
+  CONSENT_GIVEN 	(1)
+}
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.149
+// AVP: PUR-Flags (1635) 3GPP (10415)
+type AVP_Unsigned32 PUR_Flags;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.150
+// AVP: Subscribed-VSRVCC (1636) 3GPP (10415)
+type enumerated Subscribed_VSRVCC
+{
+  VSRVCC_SUBSCRIBED  (0) 
+}
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.151
+// AVP: Equivalent-PLMN-List (1637) 3GPP (10415)
+type AVP_Grouped Equivalent_PLMN_List;
+
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.152
+// AVP: CLR-Flags (1638) 3GPP (10415)
+type AVP_Unsigned32 CLR_Flags;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.153
+// AVP: UVR-Flags (1639) 3GPP (10415)
+type AVP_Unsigned32 UVR_Flags;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.154
+// AVP: UVA-Flags (1640) 3GPP (10415)
+type AVP_Unsigned32 UVA_Flags;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.155
+// AVP: VPLMN-CSG-Subscription-Data (1641) 3GPP (10415)
+type AVP_Grouped VPLMN_CSG_Subscription_Data;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.156
+// AVP: Local-Time-Zone (1649) 3GPP (10415)
+type AVP_Grouped Local_Time_Zone;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.157
+// AVP: A-MSISDN (1643) 3GPP (10415)
+type AVP_OctetString A_MSISDN;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.159
+// AVP: MME-Number-for-MT-SMS (1645) 3GPP (10415)
+type AVP_OctetString MME_Number_for_MT_SMS;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.162
+// AVP: SMS-Register-Request (1648) 3GPP (10415)
+type enumerated SMS_Register_Request
+{
+  SMS_REGISTRATION_REQUIRED      (0),
+  SMS_REGISTRATION_NOT_PREFERRED (1),
+  NO_PREFERENCE                  (2)
+}
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.163
+// AVP: Time-Zone (1642) 3GPP (10415)
+type AVP_UTF8String Time_Zone;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.164
+// AVP: Daylight-Saving-Time (1650) 3GPP (10415)
+type enumerated Daylight_Saving_Time
+{
+  NO_ADJUSTMENT             (0),
+  PLUS_ONE_HOUR_ADJUSTMENT  (1),
+  PLUS_TWO_HOURS_ADJUSTMENT (2)
+}
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.165
+// AVP: Subscription-Data-Flags (1654) 3GPP (10415)
+type AVP_Unsigned32 Subscription_Data_Flags;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.166
+// AVP: Measurement-Period-LTE (1656) 3GPP (10415)
+type enumerated Measurement_Period_LTE
+{
+  PERIOD_1024_ms  (0),
+  PERIOD_1280_ms  (1),
+  PERIOD_2048_ms  (2),
+  PERIOD_2560_ms  (3),
+  PERIOD_5120_ms  (4),
+  PERIOD_10240_ms (5),
+  PERIOD_1_min    (6)
+}
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.167
+// AVP: Measurement-Period-UMTS (1655) 3GPP (10415)
+type enumerated Measurement_Period_UMTS
+{
+  PERIOD_250_ms   (0),
+  PERIOD_500_ms   (1),
+  PERIOD_1000_ms  (2),
+  PERIOD_2000_ms  (3),
+  PERIOD_3000_ms  (4),
+  PERIOD_4000_ms  (5),
+  PERIOD_6000_ms  (6),
+  PERIOD_8000_ms  (7),
+  PERIOD_12000_ms (8),
+  PERIOD_16000_ms (9),
+  PERIOD_20000_ms (10),
+  PERIOD_24000_ms (11),
+  PERIOD_28000_ms (12),
+  PERIOD_32000_ms (13),
+  PERIOD_64000_ms (14)
+}
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.168
+// AVP: Collection-Period-RRM-LTE (1657) 3GPP (10415)
+type enumerated Collection_Period_RRM_LTE
+{
+  PERIOD_1024_ms  (0),
+  PERIOD_1280_ms  (1),
+  PERIOD_2048_ms  (2),
+  PERIOD_2560_ms  (3),
+  PERIOD_5120_ms  (4),
+  PERIOD_10240_ms (5),
+  PERIOD_1_min    (6)
+}
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.169
+// AVP: Collection-Period-RRM-UMTS (1658) 3GPP (10415)
+type enumerated Collection_Period_RRM_UMTS
+{
+  PERIOD_250_ms   (0),
+  PERIOD_500_ms   (1),
+  PERIOD_1000_ms  (2),
+  PERIOD_2000_ms  (3),
+  PERIOD_3000_ms  (4),
+  PERIOD_4000_ms  (5),
+  PERIOD_6000_ms  (6),
+  PERIOD_8000_ms  (7),
+  PERIOD_12000_ms (8),
+  PERIOD_16000_ms (9),
+  PERIOD_20000_ms (10),
+  PERIOD_24000_ms (11),
+  PERIOD_28000_ms (12),
+  PERIOD_32000_ms (13),
+  PERIOD_64000_ms (14)
+}
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.170
+// AVP: Positioning-Method (1659) 3GPP (10415)
+type AVP_OctetString Positioning_Method;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.171
+// AVP: Measurement_Quantity (1660) 3GPP (10415)
+type AVP_OctetString Measurement_Quantity;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.172
+// AVP: Event-Threshold-Event-1F (1661) 3GPP (10415)
+type AVP_Integer32 Event_Threshold_Event_1F;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.173
+// AVP: Event-Threshold-Event-1I (1662) 3GPP (10415)
+type AVP_Integer32 Event_Threshold_Event_1I;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.174
+// AVP: Restoration-Priority (1663) 3GPP (10415)
+type AVP_Unsigned32 Restoration_Priority;
+
+// 3GPP TS 29.272 V11.13.0
+// 7.3.185
+// AVP: MDT-Allowed-PLMN-Id (1671) 3GPP (10415)
+type AVP_OctetString MDT_Allowed_PLMN_Id;
diff --git a/src/AAAInterface_3GPP_TS29273_840.ddf b/src/AAAInterface_3GPP_TS29273_840.ddf
index 2873560626433a910613c3e860bf8a339aa214b4..58db0be9419ac67e34f2e4ffb284e027aff9dc7c 100644
--- a/src/AAAInterface_3GPP_TS29273_840.ddf
+++ b/src/AAAInterface_3GPP_TS29273_840.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               AAAInterface_3GPP_TS29273_840.ddf
 //  Description:        DDF for EPS AAA according to 3GPP TS 29.273 V8.4.0
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/AAAInterface_3GPP_TS29273_940.ddf b/src/AAAInterface_3GPP_TS29273_940.ddf
index 628d51799a124cb833c1b16a75f42ba5d8203380..c44f0234374d9db8cdfc22ca702c369d73d10b06 100644
--- a/src/AAAInterface_3GPP_TS29273_940.ddf
+++ b/src/AAAInterface_3GPP_TS29273_940.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               AAAInterface_3GPP_TS29273_940.ddf
 //  Description:        DDF for EPS AAA according to 3GPP TS 29.273 V9.4.0
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/AAAInterface_3GPP_TS29273_b30.ddf b/src/AAAInterface_3GPP_TS29273_b30.ddf
index ed1361cd1a8a449467842eb4a65151a07c6f6ecc..d469dd445d2e5f5e7514704f9d8ad99a4274b5be 100644
--- a/src/AAAInterface_3GPP_TS29273_b30.ddf
+++ b/src/AAAInterface_3GPP_TS29273_b30.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               AAAInterface_3GPP_TS29273_940.ddf
 //  Description:        DDF for EPS AAA according to 3GPP TS 29.273 V11.3.0
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/AVP.sh b/src/AVP.sh
old mode 100644
new mode 100755
diff --git a/src/Acision_Specific.ddf b/src/Acision_Specific.ddf
index cab1dc6f455f0106ee2e4242fb9449f37d4f3094..279121a056cfca1a2a5579c0ec7e47102fda6433 100644
--- a/src/Acision_Specific.ddf
+++ b/src/Acision_Specific.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               Acision_Specific.ddf
 //  Description:        Acision specific AVP definitions
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 //  Reference:          
 //
diff --git a/src/Alcatel_Lucent_Specific_AVPs.ddf b/src/Alcatel_Lucent_Specific_AVPs.ddf
index e436a19b913ba29a7209466746135e0efda82367..3c45a46ffefc5c71aeb2ac401c6d01e749f801c7 100644
--- a/src/Alcatel_Lucent_Specific_AVPs.ddf
+++ b/src/Alcatel_Lucent_Specific_AVPs.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               Alcatel_Lucent_Specific_AVPs.ddf
 //  Description:        Alcatel Lucent (ALU) specific AVP definitions
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
@@ -82,10 +82,8 @@ type enumerated Call_Direction
 // Diameter Offline Charging in MTAS
 // AVP: Call-Type (12) ALU (1751)
 // 5.2.11 
-type enumerated Call_Type
-{
-  Mobile   (32) 
-}
+type AVP_Unsigned32 Call_Type;
+
 
 // Diameter Offline Charging in MTAS
 // AVP: Service-ID (5) ALU (1751)
diff --git a/src/BaseTypes_IETF_RFC3588.ddf b/src/BaseTypes_IETF_RFC3588.ddf
index e13480301e9b234be6e57abcf8bcf2cd0f287334..4745f15e7c803736f50be407be71ae65d088941f 100644
--- a/src/BaseTypes_IETF_RFC3588.ddf
+++ b/src/BaseTypes_IETF_RFC3588.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               BaseTypes_IETF_RFC3588.ddf
 //  Description:	DDF for the Diameter base types
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/Base_IETF_RFC3588.ddf b/src/Base_IETF_RFC3588.ddf
index 8850840a44790ce2383c5d10c45deb88eccd93f2..537ba156e8d647a4141b68296ad53611d23fe12a 100644
--- a/src/Base_IETF_RFC3588.ddf
+++ b/src/Base_IETF_RFC3588.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               Base_IETF_RFC3588.ddf
 //  Description:	DDF for the Diameter base AVPs
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/CLCInterface_Vodafone_Rev2.ddf b/src/CLCInterface_Vodafone_Rev2.ddf
index 34f0ced9870a489f1d427a397e04bd98555baae3..17727c83424f88ec8e2d78c873ea8bed7a5bf66c 100644
--- a/src/CLCInterface_Vodafone_Rev2.ddf
+++ b/src/CLCInterface_Vodafone_Rev2.ddf
@@ -39,7 +39,7 @@
 //  Description:        DDF for CLC according to Intelligent Packet Core
 //                      Vodafone Diameter CCA Specification for the CLCI 
 //                      Version 2
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/ChargingApplications_3GPP_TS32299_850.ddf b/src/ChargingApplications_3GPP_TS32299_850.ddf
index 775a7b4fe82dd6d6fb7f392c40f1274a5385eff7..2b3f26a12efcb25f4df3c771f82c20686fd12018 100644
--- a/src/ChargingApplications_3GPP_TS32299_850.ddf
+++ b/src/ChargingApplications_3GPP_TS32299_850.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               ChargingApplication_3GPP_TS32299_850.ddf
 //  Description:        DDF for Diameter Charging Application 3GPP TS 32.299 V8.5.0
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/ChargingApplications_3GPP_TS32299_870.ddf b/src/ChargingApplications_3GPP_TS32299_870.ddf
index b1cd43a005c05835df8a309b77e136b06cd78d7e..5387f6cf5d75147fcded1ba128d55edfe8875a92 100644
--- a/src/ChargingApplications_3GPP_TS32299_870.ddf
+++ b/src/ChargingApplications_3GPP_TS32299_870.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               ChargingApplication_3GPP_TS32299_870.ddf
 //  Description:        DDF for Diameter Charging Application 3GPP TS 32.299 V8.7.0
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/ChargingApplications_3GPP_TS32299_900.ddf b/src/ChargingApplications_3GPP_TS32299_900.ddf
index 37d3b51b35d2f3adcf5ae2decb7bc13e891bd7dc..73b616055ec402ba9a01ccc6cdcf819e0b5b1e58 100644
--- a/src/ChargingApplications_3GPP_TS32299_900.ddf
+++ b/src/ChargingApplications_3GPP_TS32299_900.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               ChargingApplication_3GPP_TS32299_900.ddf
 //  Description:        DDF for Diameter Charging Application 3GPP TS 32.299 V9.0.0
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/ChargingApplications_3GPP_TS32299_940.ddf b/src/ChargingApplications_3GPP_TS32299_940.ddf
index 31b8be3c06b24237b201b2e8ea86d9c0874bee54..5b614ca314418b83d137e76ed36b4b2ca92729b9 100644
--- a/src/ChargingApplications_3GPP_TS32299_940.ddf
+++ b/src/ChargingApplications_3GPP_TS32299_940.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               ChargingApplications_3GPP_TS32299_940.ddf
 //  Description:        DDF for Diameter Charging Application 3GPP TS 32.299 V9.4.0
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/ChargingApplications_3GPP_TS32299_9b0.ddf b/src/ChargingApplications_3GPP_TS32299_9b0.ddf
index bc110367b26284c2728a11e6c725c7201363d266..917f34b03685cf2e4760aca528e635275c588835 100644
--- a/src/ChargingApplications_3GPP_TS32299_9b0.ddf
+++ b/src/ChargingApplications_3GPP_TS32299_9b0.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               ChargingApplications_3GPP_TS32299_9110.ddf
 //  Description:        DDF for Diameter Charging Application 3GPP TS 32.299 V9.11.0
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/ChargingApplications_3GPP_TS32299_AdviceOfCharge.ddf b/src/ChargingApplications_3GPP_TS32299_AdviceOfCharge.ddf
index c9200e349a9d9b3fd97d86a48d2f717fc8468173..72b0299891637e8b8b99fe9b41bda1c24852804b 100644
--- a/src/ChargingApplications_3GPP_TS32299_AdviceOfCharge.ddf
+++ b/src/ChargingApplications_3GPP_TS32299_AdviceOfCharge.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               ChargingApplication_3GPP_TS32299_AdviceOfCharge.ddf
 //  Description:        DDF for Diameter Charging Application
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/ChargingApplications_3GPP_TS32299_a60.ddf b/src/ChargingApplications_3GPP_TS32299_a60.ddf
index 24cdd218f4c25d8ee76f1feae155c65fde882f6e..3023d44960cfa7b991aeee440039719908d8dc42 100644
--- a/src/ChargingApplications_3GPP_TS32299_a60.ddf
+++ b/src/ChargingApplications_3GPP_TS32299_a60.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               ChargingApplications_3GPP_TS32299_a60.ddf
 //  Description:        DDF for Diameter Charging Application 3GPP TS 32.299 V10.6.0
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/ChargingApplications_3GPP_TS32299_be0.ddf b/src/ChargingApplications_3GPP_TS32299_be0.ddf
new file mode 100644
index 0000000000000000000000000000000000000000..cb8ad94e8f272c49841120c973c555bfe7ef4c7f
--- /dev/null
+++ b/src/ChargingApplications_3GPP_TS32299_be0.ddf
@@ -0,0 +1,1860 @@
+/******************************************************************************
+* Copyright (c) 2004, 2015  Ericsson AB
+* All rights reserved. This program and the accompanying materials
+* are made available under the terms of the Eclipse Public License v1.0
+* which accompanies this distribution, and is available at
+* http://www.eclipse.org/legal/epl-v10.html
+*
+* Contributors:
+*   Timea Moder - initial implementation
+******************************************************************************/
+//
+//  File:               ChargingApplications_3GPP_TS32299_be0.ddf
+//  Description:        DDF for Diameter Charging Application 3GPP TS 32.299 11.15.0
+//  Rev:                R34A
+//  Prodnr:             CNL 113 462
+///////////////////////////////////////////////
+
+// APPLICATION-NAME: DCA
+// APPLICATION-REVISION: V11_15_0
+
+// AVP implementations according to: 
+// 3GPP TS 32.299 V11.15.0 - Telecommunication management; Charging management;
+//
+//
+// Dependant applications
+// 3GPP TS 29.229  - Cx and Dx interfaces based on the Diameter protocol
+// IETF RFC 3588   - Diameter Base Protocol
+// RFC 4006 - Diameter Credit Control Application
+//
+// Notes:
+//
+
+
+// 3GPP TS 32.299 V11.5.0 
+type enumerated Command_Code 
+{  
+  Accounting     (271),
+  Re_Auth        (258)
+}
+
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Access-Network-Information (1263) 3GPP (10415)
+// 7.2.1
+type AVP_OctetString Access_Network_Information;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Access-Transfer-Information (2709) 3GPP (10415)
+// 7.2.1A
+type AVP_Grouped Access_Transfer_Information;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Access-Transfer-Type (2710) 3GPP (10415)
+// 7.2.1.B
+type enumerated Access_Transfer_Type
+{
+  PS_to_CS_Transfer (0),
+  CS_to_PS_Transfer (1)
+}
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Account-Expiration  (2309) 3GPP (10415)
+// 7.2.2
+type AVP_Time Account_Expiration;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Accumulated-Cost (2052) 3GPP (10415)
+// 7.2.3
+type AVP_Grouped Accumulated_Cost;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Adaptations (1217) 3GPP (10415)
+// 7.2.4
+type enumerated Adaptations
+{
+  YES (0),
+  NO  (1)
+}
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Additional-Content-Information (1207) 3GPP (10415)
+// 7.2.5
+type AVP_Grouped Additional_Content_Information;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Additional-Type-Information (1205) 3GPP (10415)
+// 7.2.6
+type AVP_UTF8String Additional_Type_Information;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Address-Data (897) 3GPP (10415)
+// 7.2.7
+type AVP_UTF8String Address_Data;
+		
+// 3GPP TS 32.299 V11.15.0
+// AVP: Address-Domain (898) 3GPP (10415)
+// 7.2.8
+type AVP_Grouped Address_Domain;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Address-Type (899) 3GPP (10415)
+// 7.2.9
+type enumerated Address_Type
+{
+  E_MAIL_ADDRESS         (0),
+  MSISDN                 (1),
+  IPV4_ADDRESS           (2),
+  IPV6_ADDRESS           (3),
+  NUMERIC_SHORTCODE      (4),
+  ALPHANUMERIC_SHORTCODE (5),
+  OTHER                  (6),
+  IMSI                   (7)
+}
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Addressee-Type (1208) 3GPP (10415)
+// 7.2.10
+type enumerated Addressee_Type
+{
+  TO  (0),
+  CC  (1),
+  BCC (2)
+}
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: AF-Correlation-Information (1276) 3GPP (10415)
+// 7.2.11
+type AVP_Grouped AF_Correlation_Information;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Alternate-Charged-Party-Address (1280) 3GPP (10415)
+// 7.2.12
+type AVP_UTF8String Alternate_Charged_Party_Address;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: AoC-Cost-Information (2053) 3GPP (10415)
+// 7.2.13
+type AVP_Grouped AoC_Cost_Information;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: AoC-Format (2310) 3GPP (10415)
+// 7.2.14
+type enumerated AoC_Format
+{
+  MONETARY (0),
+  NON_MONETARY  (1),
+  CAI (2)
+}
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: AoC-Information (2054) 3GPP (10415)
+// 7.2.15
+type AVP_Grouped AoC_Information;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: AoC-Request-Type (2055) 3GPP (10415)
+// 7.2.16
+type enumerated AoC_Request_Type
+{
+  AoC_NOT_REQUESTED     (0),
+  AoC_FULL              (1),
+  AoC_COST_ONLY         (2),
+  AoC_TARIFF_ONLY       (3)
+}
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: AoC-Service (2311) 3GPP (10415)
+// 7.2.17
+type AVP_Grouped AoC_Service;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: AoC-Service-Obligatory-Type (2312) 3GPP (10415)
+// 7.2.18
+type enumerated AoC_Service_Obligatory_Type
+{
+  NON_BINDING   (0),
+  BINDING       (1)
+}
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: AoC-Service-Type (2313) 3GPP (10415)
+// 7.2.19
+type enumerated AoC_Service_Type
+{
+  NONE   (0),
+  AOC_S  (1),
+  AOC_D  (2),
+  AOC_E  (3)
+}
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: AoC-Subscription-Information (2314) 3GPP (10415)
+// 7.2.20
+type AVP_Grouped AoC_Subscription_Information;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Applic-ID (1218) 3GPP (10415)
+// 7.2.21
+type AVP_UTF8String Applic_ID;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Application-provided-Called-Party-Address (837) 3GPP (10415)
+// 7.2.22
+type AVP_UTF8String Application_provided_Called_Party_Address;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Application-Server (836) 3GPP (10415)
+// 7.2.23
+type AVP_UTF8String Application_Server;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Application-Server-Information (850) 3GPP (10415)
+// 7.2.24
+type AVP_Grouped Application_Server_Information;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Associated-Party-Address (2035) 3GPP (10415)
+// 7.2.25
+type AVP_UTF8String Associated_Party_Address;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Associated-URI (856) 3GPP (10415)
+// 7.2.26
+type AVP_UTF8String Associated_URI;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Authorised-QoS (849) 3GPP (10415)
+// 7.2.27
+type AVP_UTF8String Authorised_QoS;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Aux-Applic-Info (1219) 3GPP (10415)
+// 7.2.28
+type AVP_UTF8String Aux_Applic_Info;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Base-Time-Interval (1265) 3GPP (10415)
+// 7.2.29
+type AVP_Unsigned32 Base_Time_Interval;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Bearer-Service (854) 3GPP (10415)
+// 7.2.30
+type AVP_OctetString Bearer_Service;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: BSSID (2716) 3GPP (10415)
+// 7.2.30A
+type AVP_UTF8String BSSID;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Called-Asserted-Identity (1250) 3GPP (10415)
+// 7.2.31
+type AVP_UTF8String Called_Asserted_Identity;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Called-Party-Address (832) 3GPP (10415)
+// 7.2.32
+type AVP_UTF8String Called_Party_Address;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Calling-Party-Address (831) 3GPP (10415)
+// 7.2.33
+type AVP_UTF8String Calling_Party_Address;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Carrier-Select-Routing-Information (2023) 3GPP (10415)
+// 7.2.34
+type AVP_UTF8String Carrier_Select_Routing_Information;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Cause-Code (861) 3GPP (10415)
+// 7.2.35
+type AVP_Integer32 Cause_Code;
+		
+// 3GPP TS 32.299 V11.15.0
+// AVP: CG-Address (846) 3GPP (10415)
+// 7.2.36
+type AVP_Address CG_Address;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Change-Condition  (2037) 3GPP (10415)
+// 7.2.37
+type AVP_Integer32 Change_Condition;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Change-Time  (2038) 3GPP (10415)
+// 7.2.38
+type AVP_Time Change_Time;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Charge-Reason-Code (2118) 3GPP (10415)
+// 7.2.38A
+type enumerated Charge_Reason_Code
+{
+  UNKNOWN (0),
+  USAGE (1),
+  COMMUNICATION_ATTEMPT_CHARGE (2),
+  SETUP_CHARGE (3),
+  ADD_ON_CHARGE (4)
+}
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Charged-Party (857) 3GPP (10415)
+// 7.2.39
+type AVP_UTF8String Charged_Party;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Charging-Characteristics-Selection-Mode (2066) 3GPP (10415)
+// 7.2.39A
+type enumerated Charging_Characteristics_Selection_Mode
+{
+  SERVING_NODE_SUPPLIED (0),
+  SUBSCRIPTION_SPECIFIC (1),
+  APN_SPECIFIC (2),
+  HOME_DEFAULT (3),
+  ROAMING_DEFAULT (4),
+  VISITING_DEFAULT (5)
+}
+		
+// 3GPP TS 32.299 V11.15.0
+// AVP: Class-Identifier (1214) 3GPP (10415)
+// 7.2.40
+type enumerated Class_Identifier
+{
+  PERSONAL      (0),
+  ADVERTISMENT  (1),
+  INFORMATIONAL (2),
+  AUTO          (3)
+}
+	
+// 3GPP TS 32.299 V11.15.0
+// AVP: Client-Address (2018) 3GPP (10415)
+// 7.2.41
+type AVP_Address Client_Address;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Content-Class (1220) 3GPP (10415)
+// 7.2.42
+type enumerated Content_Class
+{
+  TEXT          (0),
+  IMAGE_BASIC   (1),
+  IMAGE_RICH    (2),
+  VIDEO_BASIC   (3),
+  VIDEO_RICH    (4),
+  MEGAPIXEL     (5),
+  CONTENT_BASIC (6),
+  CONTENT_RICH  (7)
+}
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Content-Disposition (828) 3GPP (10415)
+// 7.2.43
+type AVP_UTF8String Content_Disposition;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Content-Length (827) 3GPP (10415)
+// 7.2.44
+type AVP_Unsigned32 Content_Length;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Content-Size (1206) 3GPP (10415)
+// 7.2.45
+type AVP_Unsigned32 Content_Size;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Content-Type (826) 3GPP (10415)
+// 7.2.46
+type AVP_UTF8String Content_Type;
+		
+// 3GPP TS 32.299 V11.15.0
+// AVP: CSG-Access-Mode (2317) 3GPP (10415)
+// 7.2.46A
+type enumerated CSG_Access_Mode
+{
+  CLOSED_MODE (0),
+  HYBRID_MODE (1)
+}
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: CSG-Membership-Indication (2318) 3GPP (10415)
+// 7.2.46B
+type enumerated CSG_Membership_Indication
+{
+  NOT_CSG_MEMBER (0),
+  CSG_MEMBER (1)
+}
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Current-Tariff (2056) 3GPP (10415)
+// 7.2.47
+type AVP_Grouped Current_Tariff;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: CUG-Information (2304) 3GPP (10415)
+// 7.2.48
+type AVP_OctetString CUG_Information;
+		
+// 3GPP TS 32.299 V11.15.0
+// AVP: Data-Coding-Scheme (2001) 3GPP (10415)
+// 7.2.49
+type AVP_Integer32 Data_Coding_Scheme;		
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: DCD-Information (2115) 3GPP (10415)
+// 7.2.50
+type AVP_Grouped DCD_Information;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Deferred-Location-Event-Type (1230) 3GPP (10415)
+// 7.2.51
+type AVP_UTF8String Deferred_Location_Event_Type;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Delivery-Report-Requested (1216) 3GPP (10415)
+// 7.2.52
+type enumerated Delivery_Report_Requested
+{
+  NO  (0),
+  YES (1)
+}
+		
+// 3GPP TS 32.299 V11.15.0
+// AVP: Destination-Interface (2002) 3GPP (10415)
+// 7.2.53
+type AVP_Grouped Destination_Interface;		
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Diagnostics (2039) 3GPP (10415)
+// 7.2.54
+type AVP_Integer32 Diagnostics;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Domain-Name (1200) 3GPP (10415)
+// 7.2.55
+type AVP_UTF8String Domain_Name;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: DRM-Content (1221) 3GPP (10415)
+// 7.2.56
+type enumerated DRM_Content
+{
+  NO  (0),
+  YES (1)
+}
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Dynamic-Address-Flag (2051) 3GPP (10415)
+// 7.2.57
+type enumerated Dynamic_Address_Flag
+{
+  STATIC    (0),
+  DYNAMIC   (1)
+}
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Dynamic-Address-Flag-Extension (2068) 3GPP (10415)
+// 7.2.57A
+type enumerated Dynamic_Address_Flag_Extension
+{
+  STATIC    (0),
+  DYNAMIC   (1)
+}
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Early-Media-Description (1272) 3GPP (10415)
+// 7.2.58
+type AVP_Grouped Early_Media_Description;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Envelope (1266) 3GPP (10415)
+// 7.2.59
+type AVP_Grouped Envelope;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Envelope-End-Time (1267) 3GPP (10415)
+// 7.2.60
+type AVP_Time Envelope_End_Time;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Envelope-Reporting (1268) 3GPP (10415)
+// 7.2.61
+type enumerated Envelope_Reporting
+{
+  DO_NOT_REPORT_ENVELOPES                 (0),
+  REPORT_ENVELOPES                        (1),
+  REPORT_ENVELOPES_WITH_VOLUME            (2),
+  REPORT_ENVELOPES_WITH_EVENTS            (3),
+  REPORT_ENVELOPES_WITH_VOLUME_AND_EVENTS (4)
+}
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Envelope-Start-Time (1269) 3GPP (10415)
+// 7.2.62
+type AVP_Time Envelope_Start_Time;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Event (825) 3GPP (10415)
+// 7.2.63
+type AVP_UTF8String Event;
+		
+// 3GPP TS 32.299 V11.15.0
+// AVP: Event-Charging-TimeStamp (1258) 3GPP (10415)
+// 7.2.64
+type AVP_Time Event_Charging_TimeStamp;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Event-Type (823) 3GPP (10415)
+// 7.2.65
+type AVP_Grouped Event_Type;
+		
+// 3GPP TS 32.299 V11.15.0
+// AVP: Expires (888) 3GPP (10415)
+// 7.2.66
+type AVP_Unsigned32 Expires;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: File-Repair-Supported (1224) 3GPP (10415)
+// 7.2.67
+type enumerated File_Repair_Supported
+{
+  SUPPORTED     (1),
+  NOT_SUPPORTED (2)
+}
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: From-Address (2708) 3GPP (10415)
+// 7.2.67A
+type AVP_UTF8String From_Address;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: GGSN-Address (847) 3GPP (10415)
+// 7.2.68
+type AVP_Address GGSN_Address;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: IM-Information (2110) 3GPP (10415)
+// 7.2.69
+type AVP_Grouped IM_Information;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Incremental-Cost (2062) 3GPP (10415)
+// 7.2.70
+type AVP_Grouped Incremental_Cost;
+		
+// 3GPP TS 32.299 V11.15.0
+// AVP: Interface-Id (2003) 3GPP (10415)
+// 7.2.71
+type AVP_UTF8String Interface_Id;		
+		
+// 3GPP TS 32.299 V11.15.0
+// AVP: Interface-Port (2004) 3GPP (10415)
+// 7.2.72
+type AVP_UTF8String Interface_Port;		
+		
+// 3GPP TS 32.299 V11.15.0
+// AVP: Interface-Text (2005) 3GPP (10415)
+// 7.2.73
+type AVP_UTF8String Interface_Text;		
+		
+// 3GPP TS 32.299 V11.15.0
+// AVP: Interface-Type (2006) 3GPP (10415)
+// 7.2.74
+type enumerated Interface_Type;	
+{
+  UNKNOWN                 (0),
+  MOBILE_ORIGINATING      (1),
+  MOBILE_TERMINATING      (2),
+  APPLICATION_ORIGINATING (3),
+  APPLICATION_TERMINATION (4)
+}
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: IMS-Application-Reference-Identifier (2601) 3GPP (10415)
+// 7.2.74A
+type AVP_UTF8String IMS_Application_Reference_Identifier;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: IMS-Charging-Identifier (841) 3GPP (10415)
+// 7.2.75
+type AVP_UTF8String IMS_Charging_Identifier;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: IMS-Communication-Service-Identifier (1281) 3GPP (10415)
+// 7.2.76
+type AVP_UTF8String IMS_Communication_Service_Identifier;		
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: IMS-Emergency-Indicator (2322) 3GPP (10415)
+// 7.2.76A
+type enumerated IMS_Emergency_Indicator;
+{
+  Non_Emergency (0),
+  Emergency (1)
+}
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: IMS-Information (876) 3GPP (10415)
+// 7.2.77
+type AVP_Grouped IMS_Information;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: IMS-Visited-Network-Identifier (2713) 3GPP (10415)
+// 7.2.77A
+type AVP_UTF8String IMS_Visited_Network_Identifier;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: IMSI-Unauthenticated-Flag (2308) 3GPP (10415)
+// 7.2.78
+type enumerated IMSI_Unauthenticated_Flag;	
+{
+  AUTHENTICATED    (0),
+  UNAUTHENTICATED  (1)
+}
+	
+// 3GPP TS 32.299 V11.15.0
+// AVP: Incoming-Trunk-Group-Id (852) 3GPP (10415)
+// 7.2.79
+type AVP_UTF8String Incoming_Trunk_Group_Id;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Initial-IMS-Charging-Identifier (2321) 3GPP (10415)
+// 7.2.79A
+type AVP_UTF8String Initial_IMS_Charging_Identifier;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Inter-Operator-Identifier (838) 3GPP (10415)
+// 7.2.80
+type AVP_Grouped Inter_Operator_Identifier;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: IP-Realm-Default-Indication (2603) 3GPP (10415)
+// 7.2.80A
+type enumerated IP_Realm_Default_Indication;	
+{
+  DEFAULT_IP_REALM_NOT_USED    (0),
+  DEFAULT_IP_REALM_USED        (1)
+}
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: LCS-APN (1231) 3GPP (10415)
+// 7.2.81
+type AVP_UTF8String LCS_APN;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: LCS-Client-Dialed-By-MS (1233) 3GPP (10415)
+// 7.2.82
+type AVP_UTF8String LCS_Client_Dialed_By_MS;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: LCS-Client-External-ID (1234) 3GPP (10415)
+// 7.2.83
+type AVP_UTF8String LCS_Client_External_ID;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: LCS-Client-Id (1232) 3GPP (10415)
+// 7.2.84
+type AVP_Grouped LCS_Client_Id;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: LCS-Client-Name (1235) 3GPP (10415)
+// 7.2.85
+type AVP_Grouped LCS_Client_Name;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: LCS-Client-Type (1241) 3GPP (10415)
+// 7.2.86
+type enumerated LCS_Client_Type
+{
+  EMERGENCY_SERVICES        (0),
+  VALUE_ADDED_SERVICES      (1),
+  PLMN_OPERATOR_SERVICES    (2),
+  LAWFUL_INTERCEPT_SERVICES (3)
+}
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: LCS-Data-Coding-Scheme (1236) 3GPP (10415)
+// 7.2.87
+type AVP_UTF8String LCS_Data_Coding_Scheme;		
+		
+// 3GPP TS 32.299 V11.15.0
+// AVP: LCS-Format-Indicator (1237) 3GPP (10415)
+// 7.2.88
+type enumerated LCS_Format_Indicator
+{
+  LOGICAL_NAME   (0),
+  EMAIL_ADDRESS  (1),
+  MSISDN         (2),
+  URL		 (3),
+  SIP_URL        (4)
+}
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: LCS-Information (878) 3GPP (10415)
+// 7.2.89
+type AVP_Grouped LCS_Information;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: LCS-Name-String (1238) 3GPP (10415)
+// 7.2.90
+type AVP_UTF8String LCS_Name_String;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: LCS-Requestor-Id (1239) 3GPP (10415)
+// 7.2.91
+type AVP_Grouped LCS_Requestor_Id;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: LCS-Requestor-Id-String (1240) 3GPP (10415)
+// 7.2.92
+type AVP_UTF8String LCS_Requestor_Id_String;
+
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Local-GW-Inserted-Indication (2604) 3GPP (10415)
+// 7.2.92A
+type enumerated Local_GW_Inserted_Indication 
+{
+  LOCAL_GW_NOT_INSERTED            (0),
+  LOCAL_GW_INSERTED                (1)
+}
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Local-Sequence-Number (2063) 3GPP (10415)
+// 7.2.93
+type AVP_Unsigned32 Local_Sequence_Number;
+
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Location-Estimate (1242) 3GPP (10415)
+// 7.2.94
+type AVP_OctetString Location_Estimate;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Location-Estimate-Type (1243) 3GPP (10415)
+// 7.2.95
+type enumerated Location_Estimate_Type 
+{
+  CURRENT_LOCATION            (0),
+  CURRENT_LAST_KNOWN_LOCATION (1),
+  INITIAL_LOCATION            (2),
+  ACTIVATE_DEFERRED_LOCATION  (3),
+  CANCEL_DEFERRED_LOCATION    (4)
+}
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Location-Type (1244) 3GPP (10415)
+// 7.2.96
+type AVP_Grouped Location_Type;
+	
+// 3GPP TS 32.299 V11.15.0
+// AVP: Low-Balance-Indication (2020) 3GPP (10415)
+// 7.2.97
+type enumerated Low_Balance_Indication
+{
+  NOT_APPLICABLE (0),
+  YES            (1)
+}
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Low-Priority-Indicator (2602) 3GPP (10415)
+// 7.2.97A
+type enumerated Low_Priority_Indicator
+{
+  NOT_APPLICABLE (0),
+  YES            (1)
+}
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: MBMS-GW-Address (2307) 3GPP (10415)
+// 7.2.98
+type AVP_Address MBMS_GW_Address;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: MBMS-Information (880) 3GPP (10415)
+// 7.2.99
+type AVP_Grouped MBMS_Information;		
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: MBMS-User-Service-Type (1225) 3GPP (10415)
+// 7.2.100
+type enumerated MBMS_User_Service_Type
+{
+  DOWNLOAD  (1),
+  STREAMING (2)
+}
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Media-Initiator-Flag (882) 3GPP (10415)
+// 7.2.101
+type enumerated Media_Initiator_Flag
+{
+  CALLED_PARTY   (0),
+  CALLING_PARTY  (1),
+  UNKNOWN        (2)
+}
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Media-Initiator-Party (1288) 3GPP (10415)
+// 7.2.102
+type AVP_UTF8String Media_Initiator_Party;		
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Message-Body (889) 3GPP (10415)
+// 7.2.103
+type AVP_Grouped Message_Body;
+	
+// 3GPP TS 32.299 V11.15.0
+// AVP: Message-Class (1213) 3GPP (10415)
+// 7.2.104
+type AVP_Grouped Message_Class;		
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Message-ID (1210) 3GPP (10415)
+// 7.2.105
+type AVP_UTF8String Message_ID;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Message-Size (1212) 3GPP (10415)
+// 7.2.106
+type AVP_Unsigned32 Message_Size;	 	
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Message-Type (1211) 3GPP (10415)
+// 7.2.107
+type enumerated Message_Type
+{
+  M_SEMD_REQ          (1),
+  M_SEMD_CONF         (2),
+  M_NOTIFICATION_IND  (3),
+  M_NOTIFYRESP_IND    (4),
+  M_RETRIEVE_CONF     (5),
+  M_ACKNOWLEDGE_IND   (6),
+  M_DELIVERY_IND      (7),
+  M_READ_REC_IND      (8),
+  M_READ_ORIG_IND     (9),
+  M_FORWARD_REQ      (10),
+  M_FORWARD_CONF     (11),
+  M_MBOX_STORE_CONF  (12),
+  M_MBOX_VIEW_CONF   (13),
+  M_MBOX_UPLOAD_CONF (14),
+  M_MBOX_DELETE_CONF (15)
+}
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: MM-Content-Type (1203) 3GPP (10415)
+// 7.2.108
+type AVP_Grouped MM_Content_Type;
+
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: MMBox-Storage-Requested (1248) 3GPP (10415)
+// 7.2.109
+type enumerated MMBox_Storage_Requested
+{
+  NO  (0),
+  YES (1)
+}
+// 3GPP TS 32.299 V11.15.0
+// AVP: MMS-Information (877) 3GPP (10415)
+// 7.2.110
+type AVP_Grouped MMS_Information;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: MMTel-Information (2030) 3GPP (10415)
+// 7.2.111
+type AVP_Grouped MMTel_Information;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: MMTel-SService-Type (2031) 3GPP (10415)
+// 7.2.111aA
+type AVP_Unsigned32 MMTel_SService_Type;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Neighbour-Node-Address (2705) 3GPP (10415)
+// 7.2.111A
+type AVP_Address Neighbour_Node_Address;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Next-Tariff (2057) 3GPP (10415)
+// 7.2.112
+type AVP_Grouped Next_Tariff;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: NNI-Information (2703) 3GPP (10415)
+// 7.2.112A
+type AVP_Grouped NNI_Information;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: NNI-Type (2704) 3GPP (10415)
+// 7.2.112B
+type enumerated NNI_Type
+{
+  Non_Roaming (0),
+  Roaming_Without_Loopback (1),
+  Roaming_With_Loopback (2)
+}
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Node-Functionality (862) 3GPP (10415)
+// 7.2.113
+type enumerated Node_Functionality
+{
+  S_CSCF  (0),
+  P_CSCF  (1),
+  I_CSCF  (2),
+  MRFC    (3),
+  MGCF    (4),
+  BGCF    (5),
+  AS      (6),
+  IBCF    (7),
+  S_GW    (8),
+  P_GW    (9),
+  HSGW    (10),
+  E_CSCF  (11),
+  MME     (12),
+  TRF     (13),
+  TF      (14),
+  ATCF    (15)
+}
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Node-Id (2064) 3GPP (10415)
+// 7.2.114
+type AVP_UTF8String Node_Id;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Number-Of-Diversions (2034) 3GPP (10415)
+// 7.2.115
+type AVP_Unsigned32 Number_Of_Diversions;
+	
+// 3GPP TS 32.299 V11.15.0
+// AVP: Number-of-Messages-Sent (2019) 3GPP (10415)
+// 7.2.116
+type AVP_Unsigned32 Number_of_Messages_Sent;		
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Number-Of-Participants (885) 3GPP (10415)
+// 7.2.117
+type AVP_Unsigned32 Number_Of_Participants;
+			
+// 3GPP TS 32.299 V11.15.0
+// AVP: Number-Of-Received-Talk-Bursts (1282) 3GPP (10415)
+// 7.2.118
+type AVP_Unsigned32 Number_Of_Received_Talk_Bursts;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Number-Of-Talk-Bursts (1283) 3GPP (10415)
+// 7.2.119
+type AVP_Unsigned32 Number_Of_Talk_Bursts;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Number-Portability-Routing-Information (2024) 3GPP (10415)
+// 7.2.120
+type AVP_UTF8String Number_Portability_Routing_Information;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Offline-Charging (1278) 3GPP (10415)
+// 7.2.121
+type AVP_Grouped Offline_Charging;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Online-Charging-Flag (2303) 3GPP (10415)
+// 7.2.122
+type enumerated Online_Charging_Flag
+{
+  ECF_ADDRESS_NOT_PROVIDED  (0),
+  ECF_ADDRESS_PROVIDED  (1)
+}
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Originating-IOI (839) 3GPP (10415)
+// 7.2.123
+type AVP_UTF8String Originating_IOI;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Originator (864) 3GPP (10415)
+// 7.2.124
+type enumerated Originator
+{
+  CALLING_PARTY	(0),
+  CALLED_PARTY 	(1)
+}
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Originator-Address (886) 3GPP (10415)
+// 7.2.125
+type AVP_Grouped Originator_Address;
+		
+// 3GPP TS 32.299 V11.15.0
+// AVP: Originator-Interface (2009) 3GPP (10415)
+// 7.2.126
+type AVP_Grouped Originator_Interface;		
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Originator-Received-Address (2027) 3GPP (10415)
+// 7.2.127 
+type AVP_Grouped Originator_Received_Address;
+		
+// 3GPP TS 32.299 V11.15.0
+// AVP: Originating-SCCP-Address (2008) 3GPP (10415)
+// 7.2.128
+type AVP_Address Originating_SCCP_Address;		
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Outgoing-Session-Id (2320) 3GPP (10415)
+// 7.2.128A
+type AVP_UTF8String Outgoing_Session_Id;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Outgoing-Trunk-Group-Id (853) 3GPP (10415)
+// 7.2.129
+type AVP_UTF8String Outgoing_Trunk_Group_Id;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Participants-Involved (887) 3GPP (10415)
+// 7.2.130
+type AVP_UTF8String Participants_Involved;	
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Participant-Group (1260) 3GPP (10415)
+// 7.2.131
+type AVP_Grouped Participant_Group;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Participant-Access-Priority (1259) 3GPP (10415)
+// 7.2.132
+type enumerated Participant_Access_Priority
+{
+  PRE_EMPTIVE_PRIORITY (1),
+  HIGH_PRIORITY        (2),
+  NORMAL_PRIORITY      (3),
+  LOW_PRIORITY         (4)
+}
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Participant-Action-Type (2049) 3GPP (10415)
+// 7.2.133
+type enumerated Participant_Action_Type
+{
+  CREATE_CONF       (0),
+  JOIN_CONF         (1),
+  INVITE_INTO_CONF  (2),
+  QUIT_CONF         (3)
+}
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: PDG-Address (895) 3GPP (10415)
+// 7.2.134
+type AVP_Address PDG_Address;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: PDG-Charging-Id (896) 3GPP (10415)
+// 7.2.135
+type AVP_Unsigned32 PDG_Charging_Id;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: PDN-Connection-Charging-ID (2050) 3GPP (10415)
+// 7.2.136
+type AVP_Unsigned32 PDN_Connection_Charging_ID;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: PDP-Address (1227) 3GPP (10415)
+// 7.2.137
+type AVP_Address PDP_Address;		
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: PDP-Address-Prefix-Length (2606) 3GPP (10415)
+// 7.2.137a
+type AVP_Unsigned32 PDP_Address_Prefix_Length;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: PDP-Context-Type (1247) 3GPP (10415)
+// 7.2.138
+type enumerated PDP_Context_Type
+{
+  PRIMARY   (0),
+  SECONDARY (1)
+}
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: PoC-Change-Conditions (1261) 3GPP (10415)
+// 7.2.139
+type enumerated PoC_Change_Conditions
+{
+  SERVICE_CHANGE                 (0),
+  VOLUME_LIMIT                   (1),
+  TIME_LIMIT                     (2),
+  NUMBER_OF_TALK_BURST_LIMIT     (3),
+  NUMBER_OF_ACTIVE_PARTICIPANTS  (4),
+  TARIFF_TIME                    (5)
+}
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: PoC-Change-Time (1262) 3GPP (10415)
+// 7.2.140
+type AVP_Time PoC_Change_Time;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: PoC-Controlling-Address (858) 3GPP (10415)
+// 7.2.141
+type AVP_UTF8String PoC_Controlling_Address;		
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: PoC-Event-Type (2025) 3GPP (10415)
+// 7.2.142
+type enumerated PoC_Event_Type
+{
+  NORMAL                         (0),
+  INSTANT_PERSONAL_ALERT_EVENT   (1),
+  POC_GROUP_ADVERTISEMENT_EVENT  (2),
+  EARLY_SESSION_SETTING_UP_EVENT (3),
+  POC_TALK_BURST                 (4)
+}
+		
+// 3GPP TS 32.299 V11.15.0
+// AVP: PoC-Group-Name (859) 3GPP (10415)
+// 7.2.143
+type AVP_UTF8String PoC_Group_Name;	
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: PoC-Information (879) 3GPP (10415)
+// 7.2.144
+type AVP_Grouped PoC_Information;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: PoC-Server-Role	 (883) 3GPP (10415)
+// 7.2.145
+type enumerated PoC_Server_Role	
+{
+  PARTICIPATING_POC_SERVER  (0),
+  CONTROLLING_POC_SERVER    (1)
+}
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: PoC-Session-Id (1229) 3GPP (10415)
+// 7.2.146
+type AVP_UTF8String PoC_Session_Id;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: PoC-Session-Initiation-Type (1277) 3GPP (10415)
+// 7.2.147
+type enumerated PoC_Session_Initiation_Type
+{
+  PRE_ESTABLISHED (0),
+  ON_DEMAND       (1)
+}
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: PoC-Session-Type (884) 3GPP (10415)
+// 7.2.148
+type enumerated PoC_Session_Type
+{
+  ONE_TO_ONE_POC_SESSION         (0),
+  CHAT_POC_GROUP_SESSION         (1),
+  PRE_ARRANGED_POC_GROUP_SESSION (2),
+  AD_HOC_POC_GROUP_SESSION       (3)
+}
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: PoC-User-Role (1252) 3GPP (10415)
+// 7.2.149
+type AVP_Grouped PoC_User_Role;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: PoC-User-Role-IDs (1253) 3GPP (10415)
+// 7.2.150
+type AVP_UTF8String PoC_User_Role_IDs;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: PoC-User-Role-info-Units (1254) 3GPP (10415)
+// 7.2.151
+type enumerated PoC_User_Role_info_Units
+{
+  MODERATOR           (1),
+  DISPATCHER          (2),
+  SESSION_OWNER       (3),
+  SESSION_PARTICIPANT (4)
+}
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Positioning-Data (1245) 3GPP (10415)
+// 7.2.152
+type AVP_UTF8String Positioning_Data;		 	
+
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Preferred-AoC-Currency (2315) 3GPP (10415)
+// 7.2.153
+type AVP_Unsigned32 Preferred_AoC_Currency;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Priority (1209) 3GPP (10415)
+// 7.2.154
+type enumerated Priority
+{
+  LOW    (0),
+  NORMAL (1),
+  HIGH   (2)
+}
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: PS-Append-Free-Format-Data (867) 3GPP (10415)
+// 7.2.155
+type enumerated PS_Append_Free_Format_Data
+{
+  APPEND    (0),
+  OVERWRITE (1)
+}
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: PS-Free-Format-Data (866) 3GPP (10415)
+// 7.2.156
+type AVP_OctetString PS_Free_Format_Data;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: PS-Furnish-Charging-Information (865) 3GPP (10415)
+// 7.2.157
+type AVP_Grouped PS_Furnish_Charging_Information;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: PS-Information (874) 3GPP (10415)
+// 7.2.158
+type AVP_Grouped PS_Information;
+				
+// 3GPP TS 32.299 V11.15.0
+// AVP: Quota-Consumption-Time (881) 3GPP (10415)
+// 7.2.159
+type AVP_Unsigned32 Quota_Consumption_Time;		
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Quota-Holding-Time (871) 3GPP (10415)
+// 7.2.160
+type AVP_Unsigned32 Quota_Holding_Time;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Rate-Element (2058) 3GPP (10415)
+// 7.2.161
+type AVP_Grouped Rate_Element;
+		
+// 3GPP TS 32.299 V11.15.0
+// AVP: Read-Reply-Report-Requested (1222) 3GPP (10415)
+// 7.2.162
+type enumerated Read_Reply_Report_Requested
+{
+  NO  (0),
+  YES (1)
+}
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Real-Time-Tariff-Information (2305) 3GPP (10415)
+// 7.2.164
+type AVP_Grouped Real_Time_Tariff_Information;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Received-Talk-Burst-Time (1284) 3GPP (10415)
+// 7.2.165
+type AVP_Unsigned32 Received_Talk_Burst_Time;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Received-Talk-Burst-Volume (1285) 3GPP (10415)
+// 7.2.166
+type AVP_Unsigned32 Received_Talk_Burst_Volume;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Recipient-Address (1201) 3GPP (10415)
+// 7.2.167
+type AVP_Grouped Recipient_Address;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Recipient-Info (2026) 3GPP (10415)
+// 7.2.168
+type AVP_Grouped Recipient_Info;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Recipient-Received-Address (2028) 3GPP (10415)
+// 7.2.169
+type AVP_Grouped Recipient_Received_Address;
+	
+// 3GPP TS 32.299 V11.15.0
+// AVP: Recipient-SCCP-Address (2010) 3GPP (10415)
+// 7.2.170
+type AVP_Address Recipient_SCCP_Address;		
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Refund-Information (2022) 3GPP (10415)
+// 7.2.171
+type AVP_OctetString Refund_Information;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Relationship-Mode (2706) 3GPP (10415)
+// 7.2.171A
+type enumerated Relationship_Mode
+{
+  Trusted (0),
+  Non_Trusted (1)
+}
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Related-IMS-Charging-Identifier (2711) 3GPP (10415)
+// 7.2.171B
+type AVP_UTF8String Related_IMS_Charging_Identifier;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Related-IMS-Charging-Identifier-Node (2712) 3GPP (10415)
+// 7.2.171C
+type AVP_Address Related_IMS_Charging_Identifier_Node;
+	
+// 3GPP TS 32.299 V11.15.0
+// AVP: Remaining-Balance (2021) 3GPP (10415)
+// 7.2.172
+type AVP_Grouped Remaining_Balance;
+
+// 3GPP TS 32.299 V8.5.0
+// AVP: Reply-Applic-ID (1223) 3GPP (10415)
+// 7.2.173
+type AVP_UTF8String Reply_Applic_ID;
+	
+// 3GPP TS 32.299 V11.15.0
+// AVP: Reply-Path-Requested (2011) 3GPP (10415)
+// 7.2.174
+type enumerated Reply_Path_Requested
+{
+  NO_REPLY_PATH_SET (0),
+  REPLY_PATH_SET    (1)
+}
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Reporting-Reason (872) 3GPP (10415)
+// 7.2.175
+type enumerated Reporting_Reason
+{
+  THRESHOLD                (0),
+  QHT                      (1),
+  FINAL                    (2),
+  QUOTA_EXHAUSTED          (3),
+  VALIDITY_TIME            (4),
+  OTHER_QUOTA_TYPE         (5),
+  RATING_CONDITION_CHANGE  (6),
+  FORCED_REAUTHORISATION   (7),
+  POOL_EXHAUSTED           (8)
+}
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Requested-Party-Address (1251) 3GPP (10415)
+// 7.2.176
+type AVP_UTF8String Requested_Party_Address;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Role-Of-Node (829) 3GPP (10415)
+// Note: not compatible with V9.2.0 or before (see spec.)
+// 7.2.177
+type enumerated Role_Of_Node
+{
+  ORIGINATING_ROLE  (0),
+  TERMINATING_ROLE  (1)
+}
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Route-Header-Received (3403) 3GPP (10415)
+// 7.2.177A
+type AVP_UTF8String Route_Header_Received;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Route-Header-Transmitted (3404) 3GPP (10415)
+// 7.2.177B
+type AVP_UTF8String Route_Header_Transmitted;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Scale-Factor (2059) 3GPP (10415)
+// 7.2.178
+type AVP_Grouped Scale_Factor;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: SDP-Answer-Timestamp (1275) 3GPP (10415)
+// 7.2.179
+type AVP_Time SDP_Answer_Timestamp;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: SDP-Media-Component (843) 3GPP (10415)
+// 7.2.180
+type AVP_Grouped SDP_Media_Component;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: SDP-Media-Description (845) 3GPP (10415)
+// 7.2.181
+type AVP_UTF8String SDP_Media_Description;		
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: SDP-Media-Name (844) 3GPP (10415)
+// 7.2.182
+type AVP_UTF8String SDP_Media_Name;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: SDP-Offer-Timestamp (1274) 3GPP (10415)
+// 7.2.183
+type AVP_Time SDP_Offer_Timestamp;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: SDP-Session-Description (842) 3GPP (10415)
+// 7.2.184
+type AVP_UTF8String SDP_Session_Description;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: SDP-TimeStamps (1273) 3GPP (10415)
+// 7.2.185
+type AVP_Grouped SDP_TimeStamps;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: SDP-Type (2036) 3GPP (10415)
+// 7.2.186
+type enumerated SDP_Type
+{
+  SDP_OFFER  (0),
+  SDP_ANSWER (1)
+}
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Session-Direction	(2707) 3GPP (10415)
+// 7.2.186A
+type enumerated Session_Direction
+{
+  Inbound (0),
+  Outbound (1)
+}
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Served-Party-IP-Address	(848) 3GPP (10415)
+// 7.2.187
+type AVP_Address Served_Party_IP_Address;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Service-Data-Container (2040) 3GPP (10415)
+// 7.2.189
+type AVP_Grouped Service_Data_Container;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Service-Id (855) 3GPP (10415)
+// 7.2.190
+type AVP_UTF8String Service_Id;
+	
+// 3GPP TS 32.299 V11.15.0
+// AVP: Service-Generic-Information (1256) 3GPP (10415)
+// 7.2.191
+type AVP_Grouped Service_Generic_Information;	 			
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Service-Information (873) 3GPP (10415)
+// 7.2.192
+type AVP_Grouped Service_Information;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Service-Mode (2032) 3GPP (10415)
+// 7.2.193
+type AVP_Unsigned32 Service_Mode;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Service-Specific-Data (863) 3GPP (10415)
+// 7.2.194
+type AVP_UTF8String Service_Specific_Data;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Service-Specific-Info (1249) 3GPP (10415)
+// 7.2.195
+type AVP_Grouped Service_Specific_Info;
+		
+// 3GPP TS 32.299 V11.15.0
+// AVP: Service-Specific-Type (1257) 3GPP (10415)
+// 7.2.196
+type AVP_Unsigned32 Service_Specific_Type;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Serving-Node-Type (2047) 3GPP (10415)
+// 7.2.198
+type enumerated Serving_Node_Type
+{
+  SGSN      (0),
+  PMIPSGW   (1),
+  GTPSGW    (2),
+  ePDG      (3),
+  hSGW      (4),
+  MME       (5)
+}
+		
+// 3GPP TS 32.299 V11.15.0
+// AVP: SGSN-Address (1228) 3GPP (10415)
+// 7.2.199
+type AVP_Address SGSN_Address;
+
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: SGW-Address (2067) 3GPP (10415)
+// 7.2.199A
+type AVP_Address SGW_Address;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: SGW-Change (2065) 3GPP (10415)
+// 7.2.200
+type enumerated SGW_Change
+{
+  ACR_Start_NOT_due_to_SGW_Change      (0),
+  ACR_Start_due_to_SGW_Change          (1)
+}
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: SIP-Method (824) 3GPP (10415)
+// 7.2.201
+type AVP_UTF8String SIP_Method;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: SIP-Request-Timestamp (834) 3GPP (10415)
+// 7.2.202
+type AVP_Time SIP_Request_Timestamp;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: SIP-Request-Timestamp-Fraction (2301) 3GPP (10415)
+// 7.2.203
+type AVP_Unsigned32 SIP_Request_Timestamp_Fraction;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: SIP-Response-Timestamp (835) 3GPP (10415)
+// 7.2.204
+type AVP_Time SIP_Response_Timestamp;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: SIP-Response-Timestamp-Fraction (2302) 3GPP (10415)
+// 7.2.205
+type AVP_Unsigned32 SIP_Response_Timestamp_Fraction;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: SM-Discharge-Time (2012) 3GPP (10415)
+// 7.2.206
+type AVP_Time SM_Discharge_Time;		
+		
+// 3GPP TS 32.299 V11.15.0
+// AVP: SM-Message-Type (2007) 3GPP (10415)
+// 7.2.207
+type enumerated SM_Message_Type
+{
+  SUBMISSION         (0),
+  DELIVERY_REPORT    (1),
+  SM_SERVICE_REQUEST (2)
+}		
+	
+// 3GPP TS 32.299 V11.15.0
+// AVP: SM-Protocol-ID (2013) 3GPP (10415)
+// 7.2.208
+type AVP_OctetString SM_Protocol_ID;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: SM-Status (2014) 3GPP (10415)
+// 7.2.209
+type AVP_OctetString SM_Status;		
+	
+// 3GPP TS 32.299 V11.15.0
+// AVP: SM-User-Data-Header (2015) 3GPP (10415)
+// 7.2.210
+type AVP_OctetString SM_User_Data_Header;		
+	
+// 3GPP TS 32.299 V11.15.0
+// AVP: SMS-Information (2000) 3GPP (10415)
+// 7.2.211
+type AVP_Grouped SMS_Information;		
+	
+// 3GPP TS 32.299 V11.15.0
+// AVP: SMS-Node (2016) 3GPP (10415)
+// 7.2.212
+type enumerated SMS_Node
+{
+  SMS_ROUTER              (0),
+  IP_SM_GW                (1),
+  SMS_ROUTER_AND_IP_SM_GW (2),
+  SMS_SC                  (3)
+}
+
+// WARNING: Unsigned32 used instead of enumerated type
+// 3GPP TS 32.299 V11.15.0
+// AVP: SM-Service-Type (2029) 3GPP (10415)
+// 7.2.213
+type AVP_Unsigned32 SM_Service_Type;
+	
+// 3GPP TS 32.299 V11.15.0
+// AVP: SMSC-Address (2017) 3GPP (10415)
+// 7.2.214
+type AVP_Address SMSC_Address;	
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Start-Time (2041) 3GPP (10415)
+// 7.2.215
+type AVP_Time Start_Time;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Status-AS-Code (2702) 3GPP (10415)
+// 7.2.215A
+type enumerated Status_AS_Code
+{
+  code_4xx (0),
+  code_5xx (1),
+  Timeout (2)
+}
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Stop-Time (2042) 3GPP (10415)
+// 7.2.216
+type AVP_Time Stop_Time;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Submission-Time (1202) 3GPP (10415)
+// 7.2.217
+type AVP_Time Submission_Time;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Subscriber-Role (2033) 3GPP (10415)
+// 7.2.218
+type enumerated Subscriber_Role
+{
+  ORIGINATING (0),
+  TERMINATING (1)
+}
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Supplementary-Service (2048) 3GPP (10415)
+// 7.2.219
+type AVP_Grouped Supplementary_Service;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: TAD-Identifier (2717) 3GPP (10415)
+// 7.2.219A
+type enumerated TAD_Identifier
+{
+  CS (0),
+  PS (1)
+}
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Talk-Burst-Exchange (1255) 3GPP (10415)
+// 7.2.220
+type AVP_Grouped Talk_Burst_Exchange;	 	
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Talk-Burst-Time (1286) 3GPP (10415)
+// 7.2.221
+type AVP_Unsigned32 Talk_Burst_Time;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Talk-Burst-Volume (1287) 3GPP (10415)
+// 7.2.222
+type AVP_Unsigned32 Talk_Burst_Volume;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Tariff-Information (2060) 3GPP (10415)
+// 7.2.223
+type AVP_Grouped Tariff_Information;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Tariff-XML (2306) 3GPP (10415)
+// 7.2.224
+type AVP_UTF8String Tariff_XML;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Terminating-IOI (840) 3GPP (10415)
+// 7.2.225
+type AVP_UTF8String Terminating_IOI;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Time_First_Usage (2043) 3GPP (10415)
+// 7.2.226
+type AVP_Time Time_First_Usage;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Time_Last_Usage (2044) 3GPP (10415)
+// 7.2.227
+type AVP_Time Time_Last_Usage;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Time-Quota-Mechanism (1270) 3GPP (10415)
+// 7.2.228
+type AVP_Grouped Time_Quota_Mechanism;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Time-Quota-Threshold (868) 3GPP (10415)
+// 7.2.229
+type AVP_Unsigned32 Time_Quota_Threshold;		
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Time-Quota-Type (1271) 3GPP (10415)
+// 7.2.230
+type enumerated Time_Quota_Type
+{
+  DISCRETE_TIME_PERIOD    (0),
+  CONTINUOUS_TIME_PERIOD  (1)
+}
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Time-Stamps (833) 3GPP (10415)
+// 7.2.231
+type AVP_Grouped Time_Stamps;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Time-Usage (2045) 3GPP (10415)
+// 7.2.232
+type AVP_Unsigned32 Time_Usage;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Traffic-Data-Volumes (2046) 3GPP (10415)
+// 7.2.233
+type AVP_Grouped Traffic_Data_Volumes;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Transcoder-Inserted-Indication (2605) 3GPP (10415)
+// 7.2.233A
+type enumerated Transcoder_Inserted_Indication
+{
+  TRANSCODER_NOT_INSERTED    (0),
+  TRANSCODER_INSERTED        (1)
+}
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Transit-IOI-List (2701) 3GPP (10415)
+// 7.2.233B
+type AVP_UTF8String Transit_IOI_List;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Token-Text (1215) 3GPP (10415)
+// 7.2.234
+type AVP_UTF8String Token_Text;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Trigger (1264) 3GPP (10415)
+// 7.2.235
+type AVP_Grouped Trigger;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Trigger-Type (870) 3GPP (10415)
+// 7.2.236
+type enumerated Trigger_Type 
+{
+  CHANGE_IN_SGSN_IP_ADDRESS                     (1),
+  CHANGE_IN_QOS                                 (2),
+  CHANGE_IN_LOCATION                            (3),
+  CHANGE_IN_RAT                                 (4),
+  CHANGE_IN_UE_TIMEZONE                         (5),
+  CHANGEINQOS_TRAFFIC_CLASS                    (10),
+  CHANGEINQOS_RELIABILITY_CLASS                (11),
+  CHANGEINQOS_DELAY_CLASS                      (12),
+  CHANGEINQOS_PEAK_THROUGHPUT                  (13),
+  CHANGEINQOS_PRECEDENCE_CLASS                 (14),
+  CHANGEINQOS_MEAN_THROUGHPUT                  (15),
+  CHANGEINQOS_MAXIMUM_BIT_RATE_FOR_UPLINK      (16),
+  CHANGEINQOS_MAXIMUM_BIT_RATE_FOR_DOWNLINK    (17),
+  CHANGEINQOS_RESIDUAL_BER                     (18),
+  CHANGEINQOS_SDU_ERROR_RATIO                  (19),
+  CHANGEINQOS_TRANSFER_DELAY                   (20),
+  CHANGEINQOS_TRAFFIC_HANDLING_PRIORITY        (21),
+  CHANGEINQOS_GUARANTEED_BIT_RATE_FOR_UPLINK   (22),
+  CHANGEINQOS_GUARANTEED_BIT_RATE_FOR_DOWNLINK (23),
+  CHANGEINLOCATION_MCC                         (30),
+  CHANGEINLOCATION_MNC                         (31),
+  CHANGEINLOCATION_RAC                         (32),
+  CHANGEINLOCATION_LAC                         (33),
+  CHANGEINLOCATION_CellId                      (34),
+  CHANGEINLOCATION_TAC                         (35),
+  CHANGEINLOCATION_ECGI                        (36),
+  CHANGE_IN_MEDIA_COMPOSITION                  (40),
+  CHANGE_IN_PARTICIPANTS_NMB                   (50),
+  CHANGE_IN_THRSHLD_OF_PARTICIPANTS_NMB        (51),
+  CHANGE_IN_USER_PARTICIPATING_TYPE            (52),
+  CHANGE_IN_SERVICE_CONDITION                  (60),
+  CHANGE_IN_SERVING_NODE                       (61),
+  CHANGE_IN_USER_CSG_INFORMATION               (70),
+  CHANGE_IN_HYBRID_SUBSCRIBED_USER_CSG_INFORMATION (71),
+  CHANGE_IN_HYBRID_UNSUBSCRIBED_USER_CSG_INFORMATION (72)
+}
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Trunk-Group-Id (851) 3GPP (10415)
+// 7.2.237
+type AVP_Grouped Trunk_Group_Id;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: TWAN-User-Location-Info (2714) 3GPP (10415)
+//
+type AVP_Grouped TWAN_User_Location_Info;
+
+// WARNING: Unsigned32 used instead of enumerated type
+// 3GPP TS 32.299 V11.15.0
+// AVP: Type-Number (1204) 3GPP (10415)
+// 7.2.238
+type AVP_Unsigned32 Type_Number;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: Unit-Cost (2061) 3GPP (10415)
+// 7.2.239
+type AVP_Grouped Unit_Cost;
+		
+// 3GPP TS 32.299 V11.15.0
+// AVP: Unit-Quota-Threshold (1226) 3GPP (10415)
+// 7.2.240
+type AVP_Unsigned32 Unit_Quota_Threshold;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: User-CSG-Information (2319) 3GPP (10415)
+// 7.2.240A
+type AVP_Grouped User_CSG_Information;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: User-Participating-Type (1279) 3GPP (10415)
+// 7.2.241
+type enumerated User_Participating_Type
+{
+  NORMAL     (0),
+  NW_POC_BOX (1),
+  UE_POC_BOX (2)
+}
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: User-Session-Id (830) 3GPP (10415)
+// 7.2.242
+type AVP_UTF8String User_Session_Id;
+		
+// 3GPP TS 32.299 V11.15.0
+// AVP: Volume-Quota-Threshold (869) 3GPP (10415)
+// 7.2.243
+type AVP_Unsigned32 Volume_Quota_Threshold;
+		
+// 3GPP TS 32.299 V11.15.0
+// AVP: WAG-Address (890) 3GPP (10415)
+// 7.2.244
+type AVP_Address WAG_Address;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: WAG-PLMN-Id (891) 3GPP (10415)
+// 7.2.245
+type AVP_OctetString WAG_PLMN_Id;		
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: WLAN-Information (875) 3GPP (10415)
+// 7.2.246
+type AVP_Grouped WLAN_Information;
+
+// 3GPP TS 32.299 V11.15.0
+// AVP: WLAN-Radio-Container (892) 3GPP (10415)
+// 7.2.247
+type AVP_Grouped WLAN_Radio_Container;
+		
+// 3GPP TS 32.299 V11.15.0
+// AVP: WLAN-Session-Id (1246) 3GPP (10415)
+// 7.2.248
+type AVP_Unsigned32 WLAN_Session_Id;
+		
+// 3GPP TS 32.299 V11.15.0
+// AVP: WLAN-Technology (893) 3GPP (10415)
+// 7.2.249
+type AVP_Unsigned32 WLAN_Technology;
+		
+// 3GPP TS 32.299 V11.15.0
+// AVP: WLAN-UE-Local-IPAddress (894) 3GPP (10415)
+// 7.2.250
+type AVP_Address WLAN_UE_Local_IPAddress;
diff --git a/src/ChargingApplications_3GPP_TS32299_c60.ddf b/src/ChargingApplications_3GPP_TS32299_c60.ddf
new file mode 100644
index 0000000000000000000000000000000000000000..c8f7cd901c355c11fa252a3e81e6674a55ae1fa6
--- /dev/null
+++ b/src/ChargingApplications_3GPP_TS32299_c60.ddf
@@ -0,0 +1,1972 @@
+/******************************************************************************
+* Copyright (c) 2004, 2014  Ericsson AB
+* All rights reserved. This program and the accompanying materials
+* are made available under the terms of the Eclipse Public License v1.0
+* which accompanies this distribution, and is available at
+* http://www.eclipse.org/legal/epl-v10.html
+*
+* Contributors:
+*   Roland Gecse - initial implementation and initial documentation
+*   Akos Pernek
+*   Antal Wuh.Hen.Chang
+*   Attila Fulop
+*   Balazs Barcsik
+*   Bence Molnar
+*   Csaba Koppany
+*   David Juhasz
+*   Eduard Czimbalmos
+*   Elemer Lelik
+*   Endre Kiss
+*   Endre Kulcsar
+*   Gabor Szalai
+*   Gabor Tatarka
+*   Gergely Futo
+*   Istvan Sandor
+*   Krisztian Pandi
+*   KulcsĂĄr Endre
+*   Laszlo Tamas Zeke
+*   Norbert Pinter
+*   Roland Gecse
+*   Tibor Bende
+*   Tibor Szabo
+*   Timea Moder
+*   Zoltan Medve
+*   Zsolt Nandor Torok
+*   Zsolt Szalai
+******************************************************************************/
+//
+//  File:               ChargingApplications_3GPP_TS32299_a60.ddf
+//  Description:        DDF for Diameter Charging Application 3GPP TS 32.299 V12.6.0
+//  Rev:                R34A
+//  Prodnr:             CNL 113 462
+///////////////////////////////////////////////
+
+
+// APPLICATION-NAME: DCA
+// APPLICATION-REVISION: V12_6_0
+
+// AVP implementations according to: 
+// 3GPP TS 32.299 V12.6.0 - Telecommunication management; Charging management;
+//
+//
+// Dependant applications
+// 3GPP TS 29.229  - Cx and Dx interfaces based on the Diameter protocol
+// IETF RFC 3588   - Diameter Base Protocol
+// RFC 4006 - Diameter Credit Control Application
+//
+// Notes:
+//
+
+
+// 3GPP TS 32.299 V12.6.0 
+type enumerated Command_Code 
+{  
+  Accounting     (271),
+  Re_Auth        (258)
+}
+
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Access-Network-Information (1263) 3GPP (10415)
+// 7.2.1
+type AVP_OctetString Access_Network_Information;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Access-Transfer-Information (2709) 3GPP (10415)
+// 7.2.1A
+type AVP_Grouped Access_Transfer_Information;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Access-Transfer-Type (2710) 3GPP (10415)
+// 7.2.1.B
+type enumerated Access_Transfer_Type
+{
+  PS_to_CS_Transfer (0),
+  CS_to_PS_Transfer (1)
+}
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Account-Expiration  (2309) 3GPP (10415)
+// 7.2.2
+type AVP_Time Account_Expiration;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Accumulated-Cost (2052) 3GPP (10415)
+// 7.2.3
+type AVP_Grouped Accumulated_Cost;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Adaptations (1217) 3GPP (10415)
+// 7.2.4
+type enumerated Adaptations
+{
+  YES (0),
+  NO  (1)
+}
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Additional-Content-Information (1207) 3GPP (10415)
+// 7.2.5
+type AVP_Grouped Additional_Content_Information;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Additional-Type-Information (1205) 3GPP (10415)
+// 7.2.6
+type AVP_UTF8String Additional_Type_Information;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Address-Data (897) 3GPP (10415)
+// 7.2.7
+type AVP_UTF8String Address_Data;
+		
+// 3GPP TS 32.299 V12.6.0
+// AVP: Address-Domain (898) 3GPP (10415)
+// 7.2.8
+type AVP_Grouped Address_Domain;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Address-Type (899) 3GPP (10415)
+// 7.2.9
+type enumerated Address_Type
+{
+  E_MAIL_ADDRESS         (0),
+  MSISDN                 (1),
+  IPV4_ADDRESS           (2),
+  IPV6_ADDRESS           (3),
+  NUMERIC_SHORTCODE      (4),
+  ALPHANUMERIC_SHORTCODE (5),
+  OTHER                  (6),
+  IMSI                   (7)
+}
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Addressee-Type (1208) 3GPP (10415)
+// 7.2.10
+type enumerated Addressee_Type
+{
+  TO  (0),
+  CC  (1),
+  BCC (2)
+}
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: AF-Correlation-Information (1276) 3GPP (10415)
+// 7.2.11
+type AVP_Grouped AF_Correlation_Information;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Alternate-Charged-Party-Address (1280) 3GPP (10415)
+// 7.2.12
+type AVP_UTF8String Alternate_Charged_Party_Address;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: AoC-Cost-Information (2053) 3GPP (10415)
+// 7.2.13
+type AVP_Grouped AoC_Cost_Information;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: AoC-Format (2310) 3GPP (10415)
+// 7.2.14
+type enumerated AoC_Format
+{
+  MONETARY (0),
+  NON_MONETARY  (1),
+  CAI (2)
+}
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: AoC-Information (2054) 3GPP (10415)
+// 7.2.15
+type AVP_Grouped AoC_Information;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: AoC-Request-Type (2055) 3GPP (10415)
+// 7.2.16
+type enumerated AoC_Request_Type
+{
+  AoC_NOT_REQUESTED     (0),
+  AoC_FULL              (1),
+  AoC_COST_ONLY         (2),
+  AoC_TARIFF_ONLY       (3)
+}
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: AoC-Service (2311) 3GPP (10415)
+// 7.2.17
+type AVP_Grouped AoC_Service;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: AoC-Service-Obligatory-Type (2312) 3GPP (10415)
+// 7.2.18
+type enumerated AoC_Service_Obligatory_Type
+{
+  NON_BINDING   (0),
+  BINDING       (1)
+}
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: AoC-Service-Type (2313) 3GPP (10415)
+// 7.2.19
+type enumerated AoC_Service_Type
+{
+  NONE   (0),
+  AOC_S  (1),
+  AOC_D  (2),
+  AOC_E  (3)
+}
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: AoC-Subscription-Information (2314) 3GPP (10415)
+// 7.2.20
+type AVP_Grouped AoC_Subscription_Information;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Applic-ID (1218) 3GPP (10415)
+// 7.2.21
+type AVP_UTF8String Applic_ID;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Application-provided-Called-Party-Address (837) 3GPP (10415)
+// 7.2.22
+type AVP_UTF8String Application_provided_Called_Party_Address;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Application-Server (836) 3GPP (10415)
+// 7.2.23
+type AVP_UTF8String Application_Server;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Application-Server-Information (850) 3GPP (10415)
+// 7.2.24
+type AVP_Grouped Application_Server_Information;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Associated-Party-Address (2035) 3GPP (10415)
+// 7.2.25
+type AVP_UTF8String Associated_Party_Address;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Associated-URI (856) 3GPP (10415)
+// 7.2.26
+type AVP_UTF8String Associated_URI;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Authorised-QoS (849) 3GPP (10415)
+// 7.2.27
+type AVP_UTF8String Authorised_QoS;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Aux-Applic-Info (1219) 3GPP (10415)
+// 7.2.28
+type AVP_UTF8String Aux_Applic_Info;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Base-Time-Interval (1265) 3GPP (10415)
+// 7.2.29
+type AVP_Unsigned32 Base_Time_Interval;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Basic-Service-Code (3411) 3GPP (10415)
+// 7.2.29A
+type AVP_Grouped Basic_Service_Code;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Bearer-Capability (3412) 3GPP (10415)
+// 7.2.29B
+type AVP_OctetString Bearer_Capability;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Bearer-Service (854) 3GPP (10415)
+// 7.2.30
+type AVP_OctetString Bearer_Service;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: BSSID (2716) 3GPP (10415)
+// 7.2.30A
+type AVP_UTF8String BSSID;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Called-Asserted-Identity (1250) 3GPP (10415)
+// 7.2.31
+type AVP_UTF8String Called_Asserted_Identity;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Called-Party-Address (832) 3GPP (10415)
+// 7.2.32
+type AVP_UTF8String Called_Party_Address;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Calling-Party-Address (831) 3GPP (10415)
+// 7.2.33
+type AVP_UTF8String Calling_Party_Address;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Carrier-Select-Routing-Information (2023) 3GPP (10415)
+// 7.2.34
+type AVP_UTF8String Carrier_Select_Routing_Information;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Cause-Code (861) 3GPP (10415)
+// 7.2.35
+type AVP_Integer32 Cause_Code;
+		
+// 3GPP TS 32.299 V12.6.0
+// AVP: CG-Address (846) 3GPP (10415)
+// 7.2.36
+type AVP_Address CG_Address;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Change-Condition  (2037) 3GPP (10415)
+// 7.2.37
+type AVP_Integer32 Change_Condition;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Change-Time  (2038) 3GPP (10415)
+// 7.2.38
+type AVP_Time Change_Time;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Charge-Reason-Code (2118) 3GPP (10415)
+// 7.2.38A
+type enumerated Charge_Reason_Code
+{
+  UNKNOWN (0),
+  USAGE (1),
+  COMMUNICATION_ATTEMPT_CHARGE (2),
+  SETUP_CHARGE (3),
+  ADD_ON_CHARGE (4)
+}
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Charged-Party (857) 3GPP (10415)
+// 7.2.39
+type AVP_UTF8String Charged_Party;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Charging-Characteristics-Selection-Mode (2066) 3GPP (10415)
+// 7.2.39A
+type enumerated Charging_Characteristics_Selection_Mode
+{
+  SERVING_NODE_SUPPLIED (0),
+  SUBSCRIPTION_SPECIFIC (1),
+  APN_SPECIFIC (2),
+  HOME_DEFAULT (3),
+  ROAMING_DEFAULT (4),
+  VISITING_DEFAULT (5)
+}
+		
+// 3GPP TS 32.299 V12.6.0
+// AVP: Class-Identifier (1214) 3GPP (10415)
+// 7.2.40
+type enumerated Class_Identifier
+{
+  PERSONAL      (0),
+  ADVERTISMENT  (1),
+  INFORMATIONAL (2),
+  AUTO          (3)
+}
+	
+// 3GPP TS 32.299 V12.6.0
+// AVP: Client-Address (2018) 3GPP (10415)
+// 7.2.41
+type AVP_Address Client_Address;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: CN-Operator-Selection-Entity (3421) 3GPP (10415)
+// 7.2.41A
+type enumerated CN_Operator_Selection_Entity
+{
+  SN_selected_by_UE (0),
+  SN_selected_by_network (1)
+}
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Content-Class (1220) 3GPP (10415)
+// 7.2.42
+type enumerated Content_Class
+{
+  TEXT          (0),
+  IMAGE_BASIC   (1),
+  IMAGE_RICH    (2),
+  VIDEO_BASIC   (3),
+  VIDEO_RICH    (4),
+  MEGAPIXEL     (5),
+  CONTENT_BASIC (6),
+  CONTENT_RICH  (7)
+}
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Content-Disposition (828) 3GPP (10415)
+// 7.2.43
+type AVP_UTF8String Content_Disposition;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Content-Length (827) 3GPP (10415)
+// 7.2.44
+type AVP_Unsigned32 Content_Length;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Content-Size (1206) 3GPP (10415)
+// 7.2.45
+type AVP_Unsigned32 Content_Size;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Content-Type (826) 3GPP (10415)
+// 7.2.46
+type AVP_UTF8String Content_Type;
+		
+// 3GPP TS 32.299 V12.6.0
+// AVP: CSG-Access-Mode (2317) 3GPP (10415)
+// 7.2.46A
+type enumerated CSG_Access_Mode
+{
+  CLOSED_MODE (0),
+  HYBRID_MODE (1)
+}
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: CSG-Membership-Indication (2318) 3GPP (10415)
+// 7.2.46B
+type enumerated CSG_Membership_Indication
+{
+  NOT_CSG_MEMBER (0),
+  CSG_MEMBER (1)
+}
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Current-Tariff (2056) 3GPP (10415)
+// 7.2.47
+type AVP_Grouped Current_Tariff;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: CUG-Information (2304) 3GPP (10415)
+// 7.2.48
+type AVP_OctetString CUG_Information;
+		
+// 3GPP TS 32.299 V12.6.0
+// AVP: Data-Coding-Scheme (2001) 3GPP (10415)
+// 7.2.49
+type AVP_Integer32 Data_Coding_Scheme;		
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: DCD-Information (2115) 3GPP (10415)
+// 7.2.50
+type AVP_Grouped DCD_Information;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Deferred-Location-Event-Type (1230) 3GPP (10415)
+// 7.2.51
+type AVP_UTF8String Deferred_Location_Event_Type;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Delivery-Report-Requested (1216) 3GPP (10415)
+// 7.2.52
+type enumerated Delivery_Report_Requested
+{
+  NO  (0),
+  YES (1)
+}
+		
+// 3GPP TS 32.299 V12.6.0
+// AVP: Destination-Interface (2002) 3GPP (10415)
+// 7.2.53
+type AVP_Grouped Destination_Interface;		
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Diagnostics (2039) 3GPP (10415)
+// 7.2.54
+type AVP_Integer32 Diagnostics;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Domain-Name (1200) 3GPP (10415)
+// 7.2.55
+type AVP_UTF8String Domain_Name;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: DRM-Content (1221) 3GPP (10415)
+// 7.2.56
+type enumerated DRM_Content
+{
+  NO  (0),
+  YES (1)
+}
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Dynamic-Address-Flag (2051) 3GPP (10415)
+// 7.2.57
+type enumerated Dynamic_Address_Flag
+{
+  STATIC    (0),
+  DYNAMIC   (1)
+}
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Dynamic-Address-Flag-Extension (2068) 3GPP (10415)
+// 7.2.57A
+type enumerated Dynamic_Address_Flag_Extension
+{
+  STATIC    (0),
+  DYNAMIC   (1)
+}
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Early-Media-Description (1272) 3GPP (10415)
+// 7.2.58
+type AVP_Grouped Early_Media_Description;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Envelope (1266) 3GPP (10415)
+// 7.2.59
+type AVP_Grouped Envelope;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Envelope-End-Time (1267) 3GPP (10415)
+// 7.2.60
+type AVP_Time Envelope_End_Time;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Envelope-Reporting (1268) 3GPP (10415)
+// 7.2.61
+type enumerated Envelope_Reporting
+{
+  DO_NOT_REPORT_ENVELOPES                 (0),
+  REPORT_ENVELOPES                        (1),
+  REPORT_ENVELOPES_WITH_VOLUME            (2),
+  REPORT_ENVELOPES_WITH_EVENTS            (3),
+  REPORT_ENVELOPES_WITH_VOLUME_AND_EVENTS (4)
+}
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Envelope-Start-Time (1269) 3GPP (10415)
+// 7.2.62
+type AVP_Time Envelope_Start_Time;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: ePDG-Address (3425) 3GPP (10415)
+// 7.2.62A
+type AVP_Address ePDG_Address;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Event (825) 3GPP (10415)
+// 7.2.63
+type AVP_UTF8String Event;
+		
+// 3GPP TS 32.299 V12.6.0
+// AVP: Event-Charging-TimeStamp (1258) 3GPP (10415)
+// 7.2.64
+type AVP_Time Event_Charging_TimeStamp;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Event-Type (823) 3GPP (10415)
+// 7.2.65
+type AVP_Grouped Event_Type;
+		
+// 3GPP TS 32.299 V12.6.0
+// AVP: Expires (888) 3GPP (10415)
+// 7.2.66
+type AVP_Unsigned32 Expires;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: File-Repair-Supported (1224) 3GPP (10415)
+// 7.2.67
+type enumerated File_Repair_Supported
+{
+  SUPPORTED     (1),
+  NOT_SUPPORTED (2)
+}
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: From-Address (2708) 3GPP (10415)
+// 7.2.67A
+type AVP_UTF8String From_Address;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Forwarding-Pending (3415) 3GPP (10415)
+// 7.2.67A
+type enumerated Forwarding_Pending
+{
+  Forwarding_not_Pending (0),
+  Forwarding_Pending (1)
+}
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: GGSN-Address (847) 3GPP (10415)
+// 7.2.68
+type AVP_Address GGSN_Address;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: IM-Information (2110) 3GPP (10415)
+// 7.2.69
+type AVP_Grouped IM_Information;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Incremental-Cost (2062) 3GPP (10415)
+// 7.2.70
+type AVP_Grouped Incremental_Cost;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Instance-Id (3402) 3GPP (10415)
+// 7.2.70A
+type AVP_UTF8String Instance_Id;
+		
+// 3GPP TS 32.299 V12.6.0
+// AVP: Interface-Id (2003) 3GPP (10415)
+// 7.2.71
+type AVP_UTF8String Interface_Id;		
+		
+// 3GPP TS 32.299 V12.6.0
+// AVP: Interface-Port (2004) 3GPP (10415)
+// 7.2.72
+type AVP_UTF8String Interface_Port;		
+		
+// 3GPP TS 32.299 V12.6.0
+// AVP: Interface-Text (2005) 3GPP (10415)
+// 7.2.73
+type AVP_UTF8String Interface_Text;		
+		
+// 3GPP TS 32.299 V12.6.0
+// AVP: Interface-Type (2006) 3GPP (10415)
+// 7.2.74
+type enumerated Interface_Type;	
+{
+  UNKNOWN                 (0),
+  MOBILE_ORIGINATING      (1),
+  MOBILE_TERMINATING      (2),
+  APPLICATION_ORIGINATING (3),
+  APPLICATION_TERMINATION (4)
+}
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: IMS-Application-Reference-Identifier (2601) 3GPP (10415)
+// 7.2.74A
+type AVP_UTF8String IMS_Application_Reference_Identifier;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: IMS-Charging-Identifier (841) 3GPP (10415)
+// 7.2.75
+type AVP_UTF8String IMS_Charging_Identifier;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: IMS-Communication-Service-Identifier (1281) 3GPP (10415)
+// 7.2.76
+type AVP_UTF8String IMS_Communication_Service_Identifier;		
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: IMS-Emergency-Indicator (2322) 3GPP (10415)
+// 7.2.76A
+type enumerated IMS_Emergency_Indicator;
+{
+  Non_Emergency (0),
+  Emergency (1)
+}
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: IMS-Information (876) 3GPP (10415)
+// 7.2.77
+type AVP_Grouped IMS_Information;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: IMS-Visited-Network-Identifier (2713) 3GPP (10415)
+// 7.2.77A
+type AVP_UTF8String IMS_Visited_Network_Identifier;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: IMSI-Unauthenticated-Flag (2308) 3GPP (10415)
+// 7.2.78
+type enumerated IMSI_Unauthenticated_Flag;	
+{
+  AUTHENTICATED    (0),
+  UNAUTHENTICATED  (1)
+}
+	
+// 3GPP TS 32.299 V12.6.0
+// AVP: Incoming-Trunk-Group-Id (852) 3GPP (10415)
+// 7.2.79
+type AVP_UTF8String Incoming_Trunk_Group_Id;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Initial-IMS-Charging-Identifier (2321) 3GPP (10415)
+// 7.2.79A
+type AVP_UTF8String Initial_IMS_Charging_Identifier;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Inter-Operator-Identifier (838) 3GPP (10415)
+// 7.2.80
+type AVP_Grouped Inter_Operator_Identifier;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: IP-Realm-Default-Indication (2603) 3GPP (10415)
+// 7.2.80A
+type enumerated IP_Realm_Default_Indication;	
+{
+  DEFAULT_IP_REALM_NOT_USED    (0),
+  DEFAULT_IP_REALM_USED        (1)
+}
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: ISUP-Cause (3416) 3GPP (10415)
+// 7.2.80B
+type AVP_Grouped ISUP_Cause;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: ISUP-Cause-Diagnostics (3422) 3GPP (10415)
+// 7.2.80C
+type AVP_OctetString ISUP_Cause_Diagnostics;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: ISUP-Cause-Location (3423) 3GPP (10415)
+// 7.2.80D
+type AVP_Unsigned32 ISUP_Cause_Location;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: ISUP-Cause-Value (3424) 3GPP (10415)
+// 7.2.80E
+type AVP_Unsigned32 ISUP_Cause_Value;	
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: ISUP-Location-Number (3414) 3GPP (10415)
+// 7.2.80F
+type AVP_OctetString ISUP_Location_Number;	
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: LCS-APN (1231) 3GPP (10415)
+// 7.2.81
+type AVP_UTF8String LCS_APN;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: LCS-Client-Dialed-By-MS (1233) 3GPP (10415)
+// 7.2.82
+type AVP_UTF8String LCS_Client_Dialed_By_MS;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: LCS-Client-External-ID (1234) 3GPP (10415)
+// 7.2.83
+type AVP_UTF8String LCS_Client_External_ID;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: LCS-Client-Id (1232) 3GPP (10415)
+// 7.2.84
+type AVP_Grouped LCS_Client_Id;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: LCS-Client-Name (1235) 3GPP (10415)
+// 7.2.85
+type AVP_Grouped LCS_Client_Name;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: LCS-Client-Type (1241) 3GPP (10415)
+// 7.2.86
+type enumerated LCS_Client_Type
+{
+  EMERGENCY_SERVICES        (0),
+  VALUE_ADDED_SERVICES      (1),
+  PLMN_OPERATOR_SERVICES    (2),
+  LAWFUL_INTERCEPT_SERVICES (3)
+}
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: LCS-Data-Coding-Scheme (1236) 3GPP (10415)
+// 7.2.87
+type AVP_UTF8String LCS_Data_Coding_Scheme;		
+		
+// 3GPP TS 32.299 V12.6.0
+// AVP: LCS-Format-Indicator (1237) 3GPP (10415)
+// 7.2.88
+type enumerated LCS_Format_Indicator
+{
+  LOGICAL_NAME   (0),
+  EMAIL_ADDRESS  (1),
+  MSISDN         (2),
+  URL		 (3),
+  SIP_URL        (4)
+}
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: LCS-Information (878) 3GPP (10415)
+// 7.2.89
+type AVP_Grouped LCS_Information;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: LCS-Name-String (1238) 3GPP (10415)
+// 7.2.90
+type AVP_UTF8String LCS_Name_String;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: LCS-Requestor-Id (1239) 3GPP (10415)
+// 7.2.91
+type AVP_Grouped LCS_Requestor_Id;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: LCS-Requestor-Id-String (1240) 3GPP (10415)
+// 7.2.92
+type AVP_UTF8String LCS_Requestor_Id_String;
+
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Local-GW-Inserted-Indication (2604) 3GPP (10415)
+// 7.2.92A
+type enumerated Local_GW_Inserted_Indication 
+{
+  LOCAL_GW_NOT_INSERTED            (0),
+  LOCAL_GW_INSERTED                (1)
+}
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Local-Sequence-Number (2063) 3GPP (10415)
+// 7.2.93
+type AVP_Unsigned32 Local_Sequence_Number;
+
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Location-Estimate (1242) 3GPP (10415)
+// 7.2.94
+type AVP_OctetString Location_Estimate;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Location-Estimate-Type (1243) 3GPP (10415)
+// 7.2.95
+type enumerated Location_Estimate_Type 
+{
+  CURRENT_LOCATION            (0),
+  CURRENT_LAST_KNOWN_LOCATION (1),
+  INITIAL_LOCATION            (2),
+  ACTIVATE_DEFERRED_LOCATION  (3),
+  CANCEL_DEFERRED_LOCATION    (4)
+}
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Location-Type (1244) 3GPP (10415)
+// 7.2.96
+type AVP_Grouped Location_Type;
+	
+// 3GPP TS 32.299 V12.6.0
+// AVP: Low-Balance-Indication (2020) 3GPP (10415)
+// 7.2.97
+type enumerated Low_Balance_Indication
+{
+  NOT_APPLICABLE (0),
+  YES            (1)
+}
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Low-Priority-Indicator (2602) 3GPP (10415)
+// 7.2.97A
+type enumerated Low_Priority_Indicator
+{
+  NOT_APPLICABLE (0),
+  YES            (1)
+}
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: MBMS-GW-Address (2307) 3GPP (10415)
+// 7.2.98
+type AVP_Address MBMS_GW_Address;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: MBMS-Information (880) 3GPP (10415)
+// 7.2.99
+type AVP_Grouped MBMS_Information;		
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: MBMS-User-Service-Type (1225) 3GPP (10415)
+// 7.2.100
+type enumerated MBMS_User_Service_Type
+{
+  DOWNLOAD  (1),
+  STREAMING (2)
+}
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Media-Initiator-Flag (882) 3GPP (10415)
+// 7.2.101
+type enumerated Media_Initiator_Flag
+{
+  CALLED_PARTY   (0),
+  CALLING_PARTY  (1),
+  UNKNOWN        (2)
+}
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Media-Initiator-Party (1288) 3GPP (10415)
+// 7.2.102
+type AVP_UTF8String Media_Initiator_Party;		
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Message-Body (889) 3GPP (10415)
+// 7.2.103
+type AVP_Grouped Message_Body;
+	
+// 3GPP TS 32.299 V12.6.0
+// AVP: Message-Class (1213) 3GPP (10415)
+// 7.2.104
+type AVP_Grouped Message_Class;		
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Message-ID (1210) 3GPP (10415)
+// 7.2.105
+type AVP_UTF8String Message_ID;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Message-Size (1212) 3GPP (10415)
+// 7.2.106
+type AVP_Unsigned32 Message_Size;	 	
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Message-Type (1211) 3GPP (10415)
+// 7.2.107
+type enumerated Message_Type
+{
+  M_SEMD_REQ          (1),
+  M_SEMD_CONF         (2),
+  M_NOTIFICATION_IND  (3),
+  M_NOTIFYRESP_IND    (4),
+  M_RETRIEVE_CONF     (5),
+  M_ACKNOWLEDGE_IND   (6),
+  M_DELIVERY_IND      (7),
+  M_READ_REC_IND      (8),
+  M_READ_ORIG_IND     (9),
+  M_FORWARD_REQ      (10),
+  M_FORWARD_CONF     (11),
+  M_MBOX_STORE_CONF  (12),
+  M_MBOX_VIEW_CONF   (13),
+  M_MBOX_UPLOAD_CONF (14),
+  M_MBOX_DELETE_CONF (15)
+}
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: MM-Content-Type (1203) 3GPP (10415)
+// 7.2.108
+type AVP_Grouped MM_Content_Type;
+
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: MMBox-Storage-Requested (1248) 3GPP (10415)
+// 7.2.109
+type enumerated MMBox_Storage_Requested
+{
+  NO  (0),
+  YES (1)
+}
+// 3GPP TS 32.299 V12.6.0
+// AVP: MMS-Information (877) 3GPP (10415)
+// 7.2.110
+type AVP_Grouped MMS_Information;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: MMTel-Information (2030) 3GPP (10415)
+// 7.2.111
+type AVP_Grouped MMTel_Information;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: MMTel-SService-Type (2031) 3GPP (10415)
+// 7.2.111A
+type AVP_Unsigned32 MMTel_SService_Type;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: MSC-Address (3417) 3GPP (10415)
+// 7.2.111B
+type AVP_OctetString MSC_Address;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: MTC-IWF-Address (3406) 3GPP (10415)
+// 7.2.111C
+type AVP_Address MTC_IWF_Address;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Neighbour-Node-Address (2705) 3GPP (10415)
+// 7.2.111D
+type AVP_Address Neighbour_Node_Address;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Network-Call-Reference-Number (3418) 3GPP (10415)
+type AVP_OctetString Network_Call_Reference_Number;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Next-Tariff (2057) 3GPP (10415)
+// 7.2.112
+type AVP_Grouped Next_Tariff;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: NNI-Information (2703) 3GPP (10415)
+// 
+type AVP_Grouped NNI_Information;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: NNI-Type (2704) 3GPP (10415)
+// 7.2.112A
+type enumerated NNI_Type
+{
+  Non_Roaming (0),
+  Roaming_Without_Loopback (1),
+  Roaming_With_Loopback (2)
+}
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Node-Functionality (862) 3GPP (10415)
+// 7.2.113
+type enumerated Node_Functionality
+{
+  S_CSCF  (0),
+  P_CSCF  (1),
+  I_CSCF  (2),
+  MRFC    (3),
+  MGCF    (4),
+  BGCF    (5),
+  AS      (6),
+  IBCF    (7),
+  S_GW    (8),
+  P_GW    (9),
+  HSGW    (10),
+  E_CSCF  (11),
+  MME     (12),
+  TRF     (13),
+  TF      (14),
+  ATCF    (15),
+  Proxy_Function (16),
+  ePDG    (17)
+}
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Node-Id (2064) 3GPP (10415)
+// 7.2.114
+type AVP_UTF8String Node_Id;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Number-Of-Diversions (2034) 3GPP (10415)
+// 7.2.115
+type AVP_Unsigned32 Number_Of_Diversions;
+	
+// 3GPP TS 32.299 V12.6.0
+// AVP: Number-of-Messages-Sent (2019) 3GPP (10415)
+// 7.2.116
+type AVP_Unsigned32 Number_of_Messages_Sent;		
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Number-Of-Participants (885) 3GPP (10415)
+// 7.2.117
+type AVP_Unsigned32 Number_Of_Participants;
+			
+// 3GPP TS 32.299 V12.6.0
+// AVP: Number-Of-Received-Talk-Bursts (1282) 3GPP (10415)
+// 7.2.118
+type AVP_Unsigned32 Number_Of_Received_Talk_Bursts;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Number-Of-Talk-Bursts (1283) 3GPP (10415)
+// 7.2.119
+type AVP_Unsigned32 Number_Of_Talk_Bursts;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Number-Portability-Routing-Information (2024) 3GPP (10415)
+// 7.2.120
+type AVP_UTF8String Number_Portability_Routing_Information;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Offline-Charging (1278) 3GPP (10415)
+// 7.2.121
+type AVP_Grouped Offline_Charging;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Online-Charging-Flag (2303) 3GPP (10415)
+// 7.2.122
+type enumerated Online_Charging_Flag
+{
+  ECF_ADDRESS_NOT_PROVIDED  (0),
+  ECF_ADDRESS_PROVIDED  (1)
+}
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Originating-IOI (839) 3GPP (10415)
+// 7.2.123
+type AVP_UTF8String Originating_IOI;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Originator (864) 3GPP (10415)
+// 7.2.124
+type enumerated Originator
+{
+  CALLING_PARTY	(0),
+  CALLED_PARTY 	(1)
+}
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Originator-Address (886) 3GPP (10415)
+// 7.2.125
+type AVP_Grouped Originator_Address;
+		
+// 3GPP TS 32.299 V12.6.0
+// AVP: Originator-Interface (2009) 3GPP (10415)
+// 7.2.126
+type AVP_Grouped Originator_Interface;		
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Originator-Received-Address (2027) 3GPP (10415)
+// 7.2.127 
+type AVP_Grouped Originator_Received_Address;
+		
+// 3GPP TS 32.299 V12.6.0
+// AVP: Originating-SCCP-Address (2008) 3GPP (10415)
+// 7.2.128
+type AVP_Address Originating_SCCP_Address;		
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Outgoing-Session-Id (2320) 3GPP (10415)
+// 7.2.128A
+type AVP_UTF8String Outgoing_Session_Id;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Outgoing-Trunk-Group-Id (853) 3GPP (10415)
+// 7.2.129
+type AVP_UTF8String Outgoing_Trunk_Group_Id;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Participants-Involved (887) 3GPP (10415)
+// 7.2.130
+type AVP_UTF8String Participants_Involved;	
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Participant-Group (1260) 3GPP (10415)
+// 7.2.131
+type AVP_Grouped Participant_Group;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Participant-Access-Priority (1259) 3GPP (10415)
+// 7.2.132
+type enumerated Participant_Access_Priority
+{
+  PRE_EMPTIVE_PRIORITY (1),
+  HIGH_PRIORITY        (2),
+  NORMAL_PRIORITY      (3),
+  LOW_PRIORITY         (4)
+}
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Participant-Action-Type (2049) 3GPP (10415)
+// 7.2.133
+type enumerated Participant_Action_Type
+{
+  CREATE_CONF       (0),
+  JOIN_CONF         (1),
+  INVITE_INTO_CONF  (2),
+  QUIT_CONF         (3)
+}
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: PDN-Connection-Charging-ID (2050) 3GPP (10415)
+// 7.2.136
+type AVP_Unsigned32 PDN_Connection_Charging_ID;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: PDP-Address (1227) 3GPP (10415)
+// 7.2.137
+type AVP_Address PDP_Address;		
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: PDP-Address-Prefix-Length (2606) 3GPP (10415)
+// 7.2.137A
+type AVP_Unsigned32 PDP_Address_Prefix_Length;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: PDP-Context-Type (1247) 3GPP (10415)
+// 7.2.138
+type enumerated PDP_Context_Type
+{
+  PRIMARY   (0),
+  SECONDARY (1)
+}
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: PoC-Change-Conditions (1261) 3GPP (10415)
+// 7.2.139
+type enumerated PoC_Change_Conditions
+{
+  SERVICE_CHANGE                 (0),
+  VOLUME_LIMIT                   (1),
+  TIME_LIMIT                     (2),
+  NUMBER_OF_TALK_BURST_LIMIT     (3),
+  NUMBER_OF_ACTIVE_PARTICIPANTS  (4),
+  TARIFF_TIME                    (5)
+}
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: PoC-Change-Time (1262) 3GPP (10415)
+// 7.2.140
+type AVP_Time PoC_Change_Time;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: PoC-Controlling-Address (858) 3GPP (10415)
+// 7.2.141
+type AVP_UTF8String PoC_Controlling_Address;		
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: PoC-Event-Type (2025) 3GPP (10415)
+// 7.2.142
+type enumerated PoC_Event_Type
+{
+  NORMAL                         (0),
+  INSTANT_PERSONAL_ALERT_EVENT   (1),
+  POC_GROUP_ADVERTISEMENT_EVENT  (2),
+  EARLY_SESSION_SETTING_UP_EVENT (3),
+  POC_TALK_BURST                 (4)
+}
+		
+// 3GPP TS 32.299 V12.6.0
+// AVP: PoC-Group-Name (859) 3GPP (10415)
+// 7.2.143
+type AVP_UTF8String PoC_Group_Name;	
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: PoC-Information (879) 3GPP (10415)
+// 7.2.144
+type AVP_Grouped PoC_Information;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: PoC-Server-Role	 (883) 3GPP (10415)
+// 7.2.145
+type enumerated PoC_Server_Role	
+{
+  PARTICIPATING_POC_SERVER  (0),
+  CONTROLLING_POC_SERVER    (1)
+}
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: PoC-Session-Id (1229) 3GPP (10415)
+// 7.2.146
+type AVP_UTF8String PoC_Session_Id;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: PoC-Session-Initiation-Type (1277) 3GPP (10415)
+// 7.2.147
+type enumerated PoC_Session_Initiation_Type
+{
+  PRE_ESTABLISHED (0),
+  ON_DEMAND       (1)
+}
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: PoC-Session-Type (884) 3GPP (10415)
+// 7.2.148
+type enumerated PoC_Session_Type
+{
+  ONE_TO_ONE_POC_SESSION         (0),
+  CHAT_POC_GROUP_SESSION         (1),
+  PRE_ARRANGED_POC_GROUP_SESSION (2),
+  AD_HOC_POC_GROUP_SESSION       (3)
+}
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: PoC-User-Role (1252) 3GPP (10415)
+// 7.2.149
+type AVP_Grouped PoC_User_Role;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: PoC-User-Role-IDs (1253) 3GPP (10415)
+// 7.2.150
+type AVP_UTF8String PoC_User_Role_IDs;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: PoC-User-Role-info-Units (1254) 3GPP (10415)
+// 7.2.151
+type enumerated PoC_User_Role_info_Units
+{
+  MODERATOR           (1),
+  DISPATCHER          (2),
+  SESSION_OWNER       (3),
+  SESSION_PARTICIPANT (4)
+}
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Positioning-Data (1245) 3GPP (10415)
+// 7.2.152
+type AVP_UTF8String Positioning_Data;		 	
+
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Preferred-AoC-Currency (2315) 3GPP (10415)
+// 7.2.153
+type AVP_Unsigned32 Preferred_AoC_Currency;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Priority (1209) 3GPP (10415)
+// 7.2.154
+type enumerated Priority
+{
+  LOW    (0),
+  NORMAL (1),
+  HIGH   (2)
+}
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: PS-Append-Free-Format-Data (867) 3GPP (10415)
+// 7.2.155
+type enumerated PS_Append_Free_Format_Data
+{
+  APPEND    (0),
+  OVERWRITE (1)
+}
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: PS-Free-Format-Data (866) 3GPP (10415)
+// 7.2.156
+type AVP_OctetString PS_Free_Format_Data;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: PS-Furnish-Charging-Information (865) 3GPP (10415)
+// 7.2.157
+type AVP_Grouped PS_Furnish_Charging_Information;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: PS-Information (874) 3GPP (10415)
+// 7.2.158
+type AVP_Grouped PS_Information;
+				
+// 3GPP TS 32.299 V12.6.0
+// AVP: Quota-Consumption-Time (881) 3GPP (10415)
+// 7.2.159
+type AVP_Unsigned32 Quota_Consumption_Time;		
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Quota-Holding-Time (871) 3GPP (10415)
+// 7.2.160
+type AVP_Unsigned32 Quota_Holding_Time;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Rate-Element (2058) 3GPP (10415)
+// 7.2.161
+type AVP_Grouped Rate_Element;
+		
+// 3GPP TS 32.299 V12.6.0
+// AVP: Read-Reply-Report-Requested (1222) 3GPP (10415)
+// 7.2.162
+type enumerated Read_Reply_Report_Requested
+{
+  NO  (0),
+  YES (1)
+}
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Real-Time-Tariff-Information (2305) 3GPP (10415)
+// 7.2.164
+type AVP_Grouped Real_Time_Tariff_Information;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Reason-Header (3401) 3GPP (10415)
+// 7.2.164A
+type AVP_UTF8String Reason_Header;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Received-Talk-Burst-Time (1284) 3GPP (10415)
+// 7.2.165
+type AVP_Unsigned32 Received_Talk_Burst_Time;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Received-Talk-Burst-Volume (1285) 3GPP (10415)
+// 7.2.166
+type AVP_Unsigned32 Received_Talk_Burst_Volume;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Recipient-Address (1201) 3GPP (10415)
+// 7.2.167
+type AVP_Grouped Recipient_Address;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Recipient-Info (2026) 3GPP (10415)
+// 7.2.168
+type AVP_Grouped Recipient_Info;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Recipient-Received-Address (2028) 3GPP (10415)
+// 7.2.169
+type AVP_Grouped Recipient_Received_Address;
+	
+// 3GPP TS 32.299 V12.6.0
+// AVP: Recipient-SCCP-Address (2010) 3GPP (10415)
+// 7.2.170
+type AVP_Address Recipient_SCCP_Address;		
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Refund-Information (2022) 3GPP (10415)
+// 7.2.171
+type AVP_OctetString Refund_Information;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Relationship-Mode (2706) 3GPP (10415)
+// 7.2.171A
+type enumerated Relationship_Mode
+{
+  Trusted (0),
+  Non_Trusted (1)
+}
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Related-IMS-Charging-Identifier (2711) 3GPP (10415)
+// 7.2.171B
+type AVP_UTF8String Related_IMS_Charging_Identifier;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Related-IMS-Charging-Identifier-Node (2712) 3GPP (10415)
+// 7.2.171C
+type AVP_Address Related_IMS_Charging_Identifier_Node;
+	
+// 3GPP TS 32.299 V12.6.0
+// AVP: Remaining-Balance (2021) 3GPP (10415)
+// 7.2.172
+type AVP_Grouped Remaining_Balance;
+
+// 3GPP TS 32.299 V8.5.0
+// AVP: Reply-Applic-ID (1223) 3GPP (10415)
+// 7.2.173
+type AVP_UTF8String Reply_Applic_ID;
+	
+// 3GPP TS 32.299 V12.6.0
+// AVP: Reply-Path-Requested (2011) 3GPP (10415)
+// 7.2.174
+type enumerated Reply_Path_Requested
+{
+  NO_REPLY_PATH_SET (0),
+  REPLY_PATH_SET    (1)
+}
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Reporting-Reason (872) 3GPP (10415)
+// 7.2.175
+type enumerated Reporting_Reason
+{
+  THRESHOLD                (0),
+  QHT                      (1),
+  FINAL                    (2),
+  QUOTA_EXHAUSTED          (3),
+  VALIDITY_TIME            (4),
+  OTHER_QUOTA_TYPE         (5),
+  RATING_CONDITION_CHANGE  (6),
+  FORCED_REAUTHORISATION   (7),
+  POOL_EXHAUSTED           (8)
+}
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Requested-Party-Address (1251) 3GPP (10415)
+// 7.2.176
+type AVP_UTF8String Requested_Party_Address;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Role-Of-Node (829) 3GPP (10415)
+// Note: not compatible with V9.2.0 or before (see spec.)
+// 7.2.177
+type enumerated Role_Of_Node
+{
+  ORIGINATING_ROLE  (0),
+  TERMINATING_ROLE  (1)
+}
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Route-Header-Received (3403) 3GPP (10415)
+// 7.2.177A
+type AVP_UTF8String Route_Header_Received;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Route-Header-Transmitted (3404) 3GPP (10415)
+// 7.2.177B
+type AVP_UTF8String Route_Header_Transmitted;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Scale-Factor (2059) 3GPP (10415)
+// 7.2.178
+type AVP_Grouped Scale_Factor;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: SDP-Answer-Timestamp (1275) 3GPP (10415)
+// 7.2.179
+type AVP_Time SDP_Answer_Timestamp;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: SDP-Media-Component (843) 3GPP (10415)
+// 7.2.180
+type AVP_Grouped SDP_Media_Component;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: SDP-Media-Description (845) 3GPP (10415)
+// 7.2.181
+type AVP_UTF8String SDP_Media_Description;		
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: SDP-Media-Name (844) 3GPP (10415)
+// 7.2.182
+type AVP_UTF8String SDP_Media_Name;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: SDP-Offer-Timestamp (1274) 3GPP (10415)
+// 7.2.183
+type AVP_Time SDP_Offer_Timestamp;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: SDP-Session-Description (842) 3GPP (10415)
+// 7.2.184
+type AVP_UTF8String SDP_Session_Description;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: SDP-TimeStamps (1273) 3GPP (10415)
+// 7.2.185
+type AVP_Grouped SDP_TimeStamps;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: SDP-Type (2036) 3GPP (10415)
+// 7.2.186
+type enumerated SDP_Type
+{
+  SDP_OFFER  (0),
+  SDP_ANSWER (1)
+}
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Session-Direction	(2707) 3GPP (10415)
+// 7.2.186A
+type enumerated Session_Direction
+{
+  Inbound (0),
+  Outbound (1)
+}
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Served-Party-IP-Address	(848) 3GPP (10415)
+// 7.2.187
+type AVP_Address Served_Party_IP_Address;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Service-Data-Container (2040) 3GPP (10415)
+// 7.2.189
+type AVP_Grouped Service_Data_Container;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Service-Id (855) 3GPP (10415)
+// 7.2.190
+type AVP_UTF8String Service_Id;
+	
+// 3GPP TS 32.299 V12.6.0
+// AVP: Service-Generic-Information (1256) 3GPP (10415)
+// 7.2.191
+type AVP_Grouped Service_Generic_Information;	 			
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Service-Information (873) 3GPP (10415)
+// 7.2.192
+type AVP_Grouped Service_Information;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Service-Mode (2032) 3GPP (10415)
+// 7.2.193
+type AVP_Unsigned32 Service_Mode;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Service-Specific-Data (863) 3GPP (10415)
+// 7.2.194
+type AVP_UTF8String Service_Specific_Data;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Service-Specific-Info (1249) 3GPP (10415)
+// 7.2.195
+type AVP_Grouped Service_Specific_Info;
+		
+// 3GPP TS 32.299 V12.6.0
+// AVP: Service-Specific-Type (1257) 3GPP (10415)
+// 7.2.196
+type AVP_Unsigned32 Service_Specific_Type;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Serving-Node-Type (2047) 3GPP (10415)
+// 7.2.198
+type enumerated Serving_Node_Type
+{
+  SGSN      (0),
+  PMIPSGW   (1),
+  GTPSGW    (2),
+  ePDG      (3),
+  hSGW      (4),
+  MME       (5)
+}
+		
+// 3GPP TS 32.299 V12.6.0
+// AVP: SGSN-Address (1228) 3GPP (10415)
+// 7.2.199
+type AVP_Address SGSN_Address;
+
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: SGW-Address (2067) 3GPP (10415)
+// 7.2.199A
+type AVP_Address SGW_Address;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: SGW-Change (2065) 3GPP (10415)
+// 7.2.200
+type enumerated SGW_Change
+{
+  ACR_Start_NOT_due_to_SGW_Change      (0),
+  ACR_Start_due_to_SGW_Change          (1)
+}
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: SIP-Method (824) 3GPP (10415)
+// 7.2.201
+type AVP_UTF8String SIP_Method;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: SIP-Request-Timestamp (834) 3GPP (10415)
+// 7.2.202
+type AVP_Time SIP_Request_Timestamp;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: SIP-Request-Timestamp-Fraction (2301) 3GPP (10415)
+// 7.2.203
+type AVP_Unsigned32 SIP_Request_Timestamp_Fraction;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: SIP-Response-Timestamp (835) 3GPP (10415)
+// 7.2.204
+type AVP_Time SIP_Response_Timestamp;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: SIP-Response-Timestamp-Fraction (2302) 3GPP (10415)
+// 7.2.205
+type AVP_Unsigned32 SIP_Response_Timestamp_Fraction;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: SM-Device-Trigger-Indicator (3407) 3GPP (10415)
+// 7.2.205A
+type enumerated SM_Device_Trigger_Indicator
+{
+  Not_Device_Trigger (0),
+  Device_Trigger (1)
+}
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: SM-Device-Trigger-Information (3405) 3GPP (10415)
+// 7.2.205B
+type AVP_Grouped SM_Device_Trigger_Information;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: SM-Discharge-Time (2012) 3GPP (10415)
+// 7.2.206
+type AVP_Time SM_Discharge_Time;		
+		
+// 3GPP TS 32.299 V12.6.0
+// AVP: SM-Message-Type (2007) 3GPP (10415)
+// 7.2.207
+type enumerated SM_Message_Type
+{
+  SUBMISSION         (0),
+  DELIVERY_REPORT    (1),
+  SM_SERVICE_REQUEST (2)
+}		
+	
+// 3GPP TS 32.299 V12.6.0
+// AVP: SM-Protocol-ID (2013) 3GPP (10415)
+// 7.2.208
+type AVP_OctetString SM_Protocol_ID;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: SM-Sequence-Number (3408) 3GPP (10415)
+// 7.2.208A
+type AVP_Unsigned32 SM_Sequence_Number;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: SM-Status (2014) 3GPP (10415)
+// 7.2.209
+type AVP_OctetString SM_Status;		
+	
+// 3GPP TS 32.299 V12.6.0
+// AVP: SM-User-Data-Header (2015) 3GPP (10415)
+// 7.2.210
+type AVP_OctetString SM_User_Data_Header;		
+	
+// 3GPP TS 32.299 V12.6.0
+// AVP: SMS-Information (2000) 3GPP (10415)
+// 7.2.211
+type AVP_Grouped SMS_Information;		
+	
+// 3GPP TS 32.299 V12.6.0
+// AVP: SMS-Node (2016) 3GPP (10415)
+// 7.2.212
+type enumerated SMS_Node
+{
+  SMS_ROUTER              (0),
+  IP_SM_GW                (1),
+  SMS_ROUTER_AND_IP_SM_GW (2),
+  SMS_SC                  (3)
+}
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: SMS-Result (3409) 3GPP (10415)
+// 7.2.212A
+type AVP_Unsigned32 SMS_Result;
+
+// WARNING: Unsigned32 used instead of enumerated type
+// 3GPP TS 32.299 V12.6.0
+// AVP: SM-Service-Type (2029) 3GPP (10415)
+// 7.2.213
+type AVP_Unsigned32 SM_Service_Type;
+	
+// 3GPP TS 32.299 V12.6.0
+// AVP: SMSC-Address (2017) 3GPP (10415)
+// 7.2.214
+type AVP_Address SMSC_Address;	
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Start-Of-Charging (3419) 3GPP (10415)
+// 7.2.214A
+type AVP_Time Start_Of_Charging;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Start-Time (2041) 3GPP (10415)
+// 7.2.215
+type AVP_Time Start_Time;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Status-Code (2702) 3GPP (10415)
+// 7.2.215A
+type enumerated Status_Code
+{
+  code_4xx (0),
+  code_5xx (1),
+  Timeout (2)
+}
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Stop-Time (2042) 3GPP (10415)
+// 7.2.216
+type AVP_Time Stop_Time;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Submission-Time (1202) 3GPP (10415)
+// 7.2.217
+type AVP_Time Submission_Time;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Subscriber-Role (2033) 3GPP (10415)
+// 7.2.218
+type enumerated Subscriber_Role
+{
+  ORIGINATING (0),
+  TERMINATING (1)
+}
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Supplementary-Service (2048) 3GPP (10415)
+// 7.2.219
+type AVP_Grouped Supplementary_Service;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: TAD-Identifier (2717) 3GPP (10415)
+// 7.2.219A
+type enumerated TAD_Identifier
+{
+  CS (0),
+  PS (1)
+}
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Talk-Burst-Exchange (1255) 3GPP (10415)
+// 7.2.220
+type AVP_Grouped Talk_Burst_Exchange;	 	
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Talk-Burst-Time (1286) 3GPP (10415)
+// 7.2.221
+type AVP_Unsigned32 Talk_Burst_Time;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Talk-Burst-Volume (1287) 3GPP (10415)
+// 7.2.222
+type AVP_Unsigned32 Talk_Burst_Volume;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Tariff-Information (2060) 3GPP (10415)
+// 7.2.223
+type AVP_Grouped Tariff_Information;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Tariff-XML (2306) 3GPP (10415)
+// 7.2.224
+type AVP_UTF8String Tariff_XML;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Teleservice (3413) 3GPP (10415)
+//
+type AVP_OctetString Teleservice;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Terminating-IOI (840) 3GPP (10415)
+// 7.2.225
+type AVP_UTF8String Terminating_IOI;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Time_First_Usage (2043) 3GPP (10415)
+// 7.2.226
+type AVP_Time Time_First_Usage;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Time_Last_Usage (2044) 3GPP (10415)
+// 7.2.227
+type AVP_Time Time_Last_Usage;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Time-Quota-Mechanism (1270) 3GPP (10415)
+// 7.2.228
+type AVP_Grouped Time_Quota_Mechanism;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Time-Quota-Threshold (868) 3GPP (10415)
+// 7.2.229
+type AVP_Unsigned32 Time_Quota_Threshold;		
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Time-Quota-Type (1271) 3GPP (10415)
+// 7.2.230
+type enumerated Time_Quota_Type
+{
+  DISCRETE_TIME_PERIOD    (0),
+  CONTINUOUS_TIME_PERIOD  (1)
+}
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Time-Stamps (833) 3GPP (10415)
+// 7.2.231
+type AVP_Grouped Time_Stamps;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Time-Usage (2045) 3GPP (10415)
+// 7.2.232
+type AVP_Unsigned32 Time_Usage;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Traffic-Data-Volumes (2046) 3GPP (10415)
+// 7.2.233
+type AVP_Grouped Traffic_Data_Volumes;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Transcoder-Inserted-Indication (2605) 3GPP (10415)
+// 7.2.233A
+type enumerated Transcoder_Inserted_Indication
+{
+  TRANSCODER_NOT_INSERTED    (0),
+  TRANSCODER_INSERTED        (1)
+}
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Transit-IOI-List (2701) 3GPP (10415)
+// 7.2.233B
+type AVP_UTF8String Transit_IOI_List;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Token-Text (1215) 3GPP (10415)
+// 7.2.234
+type AVP_UTF8String Token_Text;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Trigger (1264) 3GPP (10415)
+// 7.2.235
+type AVP_Grouped Trigger;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Trigger-Type (870) 3GPP (10415)
+// 7.2.236
+type enumerated Trigger_Type 
+{
+  CHANGE_IN_SGSN_IP_ADDRESS                     (1),
+  CHANGE_IN_QOS                                 (2),
+  CHANGE_IN_LOCATION                            (3),
+  CHANGE_IN_RAT                                 (4),
+  CHANGE_IN_UE_TIMEZONE                         (5),
+  CHANGEINQOS_TRAFFIC_CLASS                    (10),
+  CHANGEINQOS_RELIABILITY_CLASS                (11),
+  CHANGEINQOS_DELAY_CLASS                      (12),
+  CHANGEINQOS_PEAK_THROUGHPUT                  (13),
+  CHANGEINQOS_PRECEDENCE_CLASS                 (14),
+  CHANGEINQOS_MEAN_THROUGHPUT                  (15),
+  CHANGEINQOS_MAXIMUM_BIT_RATE_FOR_UPLINK      (16),
+  CHANGEINQOS_MAXIMUM_BIT_RATE_FOR_DOWNLINK    (17),
+  CHANGEINQOS_RESIDUAL_BER                     (18),
+  CHANGEINQOS_SDU_ERROR_RATIO                  (19),
+  CHANGEINQOS_TRANSFER_DELAY                   (20),
+  CHANGEINQOS_TRAFFIC_HANDLING_PRIORITY        (21),
+  CHANGEINQOS_GUARANTEED_BIT_RATE_FOR_UPLINK   (22),
+  CHANGEINQOS_GUARANTEED_BIT_RATE_FOR_DOWNLINK (23),
+  CHANGEINLOCATION_MCC                         (30),
+  CHANGEINLOCATION_MNC                         (31),
+  CHANGEINLOCATION_RAC                         (32),
+  CHANGEINLOCATION_LAC                         (33),
+  CHANGEINLOCATION_CellId                      (34),
+  CHANGEINLOCATION_TAC                         (35),
+  CHANGEINLOCATION_ECGI                        (36),
+  CHANGE_IN_MEDIA_COMPOSITION                  (40),
+  CHANGE_IN_PARTICIPANTS_NMB                   (50),
+  CHANGE_IN_THRSHLD_OF_PARTICIPANTS_NMB        (51),
+  CHANGE_IN_USER_PARTICIPATING_TYPE            (52),
+  CHANGE_IN_SERVICE_CONDITION                  (60),
+  CHANGE_IN_SERVING_NODE                       (61),
+  CHANGE_IN_USER_CSG_INFORMATION               (70),
+  CHANGE_IN_HYBRID_SUBSCRIBED_USER_CSG_INFORMATION (71),
+  CHANGE_IN_HYBRID_UNSUBSCRIBED_USER_CSG_INFORMATION (72)
+}
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Trunk-Group-Id (851) 3GPP (10415)
+// 7.2.237
+type AVP_Grouped Trunk_Group_Id;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: TWAN-User-Location-Info (2714) 3GPP (10415)
+//
+type AVP_Grouped TWAN_User_Location_Info;
+
+// WARNING: Unsigned32 used instead of enumerated type
+// 3GPP TS 32.299 V12.6.0
+// AVP: Type-Number (1204) 3GPP (10415)
+// 7.2.238
+type AVP_Unsigned32 Type_Number;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: Unit-Cost (2061) 3GPP (10415)
+// 7.2.239
+type AVP_Grouped Unit_Cost;
+		
+// 3GPP TS 32.299 V12.6.0
+// AVP: Unit-Quota-Threshold (1226) 3GPP (10415)
+// 7.2.240
+type AVP_Unsigned32 Unit_Quota_Threshold;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: User-CSG-Information (2319) 3GPP (10415)
+// 7.2.240A
+type AVP_Grouped User_CSG_Information;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: User-Participating-Type (1279) 3GPP (10415)
+// 7.2.241
+type enumerated User_Participating_Type
+{
+  NORMAL     (0),
+  NW_POC_BOX (1),
+  UE_POC_BOX (2)
+}
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: User-Session-Id (830) 3GPP (10415)
+// 7.2.242
+type AVP_UTF8String User_Session_Id;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: VCS-Information (3410) 3GPP (10415)
+// 7.2.242A
+type AVP_Grouped VCS_Information;
+
+// 3GPP TS 32.299 V12.6.0
+// AVP: VLR-Number (3420) 3GPP (10415)
+// 7.2.242B
+type AVP_OctetString VLR_Number;
+		
+// 3GPP TS 32.299 V12.6.0
+// AVP: Volume-Quota-Threshold (869) 3GPP (10415)
+// 7.2.243
+type AVP_Unsigned32 Volume_Quota_Threshold;
+
+
diff --git a/src/CreditControl_IETF_RFC4006.ddf b/src/CreditControl_IETF_RFC4006.ddf
index 3859ebe340cf908c9e5353b8f3783852f7f33b68..fe38d5b6735d71c443cf7cbd9df4e48618a12ef3 100644
--- a/src/CreditControl_IETF_RFC4006.ddf
+++ b/src/CreditControl_IETF_RFC4006.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               CreditControl_IETF_RFC4006.ddf
 //  Description:        DDF for DCC according to RFC 4006
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 1134 62
 ///////////////////////////////////////////////
 
diff --git a/src/CxDxInterface_3GPP_TS29229_6a0.ddf b/src/CxDxInterface_3GPP_TS29229_6a0.ddf
index f7c9a78283b28661e6443f0e217e699109d55687..4271fd1c7ad4aaa980d31959e7bd567786bc031d 100644
--- a/src/CxDxInterface_3GPP_TS29229_6a0.ddf
+++ b/src/CxDxInterface_3GPP_TS29229_6a0.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               CxDxInterface_3GPP_TS29229_6a0.ddf
 //  Description:        DDF for CxDx according to 3GPP TS 29.229 V6.10.0
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/CxDxInterface_3GPP_TS29229_840.ddf b/src/CxDxInterface_3GPP_TS29229_840.ddf
index 9ff12154988132fb70eb647854857418ef92a9ad..721eae787fd0e92ec98b8dd06ab51c87e73f571c 100644
--- a/src/CxDxInterface_3GPP_TS29229_840.ddf
+++ b/src/CxDxInterface_3GPP_TS29229_840.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               CxDxInterface_3GPP_TS29229_840.ddf
 //  Description:        DDF for CxDx according to 3GPP TS 29.229 V8.4.0
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/CxDxInterface_3GPP_TS29229_880.ddf b/src/CxDxInterface_3GPP_TS29229_880.ddf
index 83da8d3b474a600e0f5a37cfd8f72d8fbd324118..451f48f95cfe3f6cbbf32532e04bf11b3026341f 100644
--- a/src/CxDxInterface_3GPP_TS29229_880.ddf
+++ b/src/CxDxInterface_3GPP_TS29229_880.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               CxDxInterface_3GPP_TS29229_880.ddf
 //  Description:        DDF for CxDx according to 3GPP TS 29.229 V8.8.0
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/CxDxInterface_3GPP_TS29229_920.ddf b/src/CxDxInterface_3GPP_TS29229_920.ddf
index 9009ba7aa8d171216d082b15bfa43a813e74329a..b21cc177d122419d87f782a01a94f1de8d737a6a 100644
--- a/src/CxDxInterface_3GPP_TS29229_920.ddf
+++ b/src/CxDxInterface_3GPP_TS29229_920.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               CxDxInterface_3GPP_TS29229_880.ddf
 //  Description:        DDF for CxDx according to 3GPP TS 29.229 V9.2.0
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/CxDxInterface_3GPP_TS29229_c30.ddf b/src/CxDxInterface_3GPP_TS29229_c30.ddf
new file mode 100644
index 0000000000000000000000000000000000000000..cbd01a01da86099ba2ccb000ac641fa4bd251d85
--- /dev/null
+++ b/src/CxDxInterface_3GPP_TS29229_c30.ddf
@@ -0,0 +1,375 @@
+/******************************************************************************
+* Copyright (c) 2004, 2014  Ericsson AB
+* All rights reserved. This program and the accompanying materials
+* are made available under the terms of the Eclipse Public License v1.0
+* which accompanies this distribution, and is available at
+* http://www.eclipse.org/legal/epl-v10.html
+*
+* Contributors:
+*   Gabor Szalai - initial implementation and initial documentation
+******************************************************************************/
+//
+//  File:               CxDxInterface_3GPP_TS29229_c30.ddf
+//  Description:        DDF for CxDx according to 3GPP TS 29.229 V12.3.0
+//  Rev:                R34A
+//  Prodnr:             CNL 113 462
+///////////////////////////////////////////////
+
+
+// APPLICATION-NAME: CxDx
+// APPLICATION-REVISION: V12_3_0
+
+// AVP implementations according to: 
+// 3GPP TS 29.229 V12.3.0 - Cx and Dx interfaces based on the Diameter protocol
+//
+//
+// Dependant applications
+// IETF RFC 3588   - Diameter Base Protocol
+// IETF RFC 4005   - Diameter Network Access Server Application
+// IETF RFC 5090 (Obsoletes: 4590)   - RADIUS Extension for Digest Authentication
+//
+// Notes: 
+// Present application has its own vendor specific Diameter application id: 16777216
+//
+
+// 3GPP TS 29.229 V12.3.0 6.1
+type enumerated Command_Code {
+  User_Authorization       (300),
+  Server_Assignment        (301),
+  Location_Info            (302),
+  Multimedia_Auth          (303),
+  Registration_Termination (304),
+  Push_Profile             (305)
+}
+
+
+
+// 3GPP 29.229 V12.3.0
+// AVP: Visited-Network-Identifier (600) 3GPP (10415)
+// 6.3.1
+type AVP_OctetString Visited_Network_Identifier;
+
+// 3GPP 29.229 V12.3.0
+// AVP: Public-Identity (601) 3GPP (10415)
+// 6.3.2
+type AVP_UTF8String Public_Identity;
+
+// 3GPP 29.229 V12.3.0
+// AVP: Server-Name (602) 3GPP (10415)
+// 6.3.3
+type AVP_UTF8String Server_Name;
+
+// 3GPP 29.229 V12.3.0
+// AVP: Server-Capabilities (603) 3GPP (10415)
+// 6.3.4
+type AVP_Grouped Server_Capabilities;
+
+// 3GPP 29.229 V12.3.0
+// AVP: Mandatory-Capability (604) 3GPP (10415)
+// 6.3.5
+type AVP_Unsigned32 Mandatory_Capability;
+
+// 3GPP 29.229 V12.3.0
+// AVP: Optional-Capability (605) 3GPP (10415)
+// 6.3.6
+type AVP_Unsigned32 Optional_Capability;
+
+// 3GPP 29.229 V12.3.0
+// AVP: User-Data (606) 3GPP (10415)
+// 6.3.7
+type AVP_OctetString User_Data;
+
+// 3GPP 29.229 V12.3.0
+// AVP: SIP-Number-Auth-Items (607) 3GPP (10415)
+// 6.3.8
+type AVP_Unsigned32 SIP_Number_Auth_Items;
+
+// 3GPP 29.229 V12.3.0
+// AVP: SIP-Authentication-Scheme (608) 3GPP (10415)
+// 6.3.9
+type AVP_UTF8String SIP_Authentication_Scheme;
+
+// 3GPP 29.229 V12.3.0
+// AVP: SIP-Authenticate (609) 3GPP (10415)
+// 6.3.10
+type AVP_OctetString SIP_Authenticate;
+
+// 3GPP 29.229 V12.3.0
+// AVP: SIP-Authorization (610) 3GPP (10415)
+// 6.3.11
+type AVP_OctetString SIP_Authorization;
+
+// 3GPP 29.229 V12.3.0
+// AVP: SIP-Authentication-Context (611) 3GPP (10415)
+// 6.3.12
+type AVP_OctetString SIP_Authentication_Context;
+
+// 3GPP 29.229 V12.3.0
+// AVP: SIP-Auth-Data-Item (612) 3GPP (10415)
+// 6.3.13
+type AVP_Grouped SIP_Auth_Data_Item;
+
+// 3GPP 29.229 V12.3.0
+// AVP: SIP-Item-Number (613) 3GPP (10415)
+// 6.3.14
+type AVP_Unsigned32 SIP_Item_Number;
+
+// 3GPP 29.229 V12.3.0
+// AVP: Server-Assignment-Type (614) 3GPP (10415)
+// 6.3.15
+type enumerated Server_Assignment_Type
+{
+  NO_ASSIGNMENT                             (0),
+  REGISTRATION                              (1),
+  RE_REGISTRATION                           (2),
+  UNREGISTERED_USER                         (3),
+  TIMEOUT_DEREGISTRATION                    (4),
+  USER_DEREGISTRATION                       (5),
+  TIMEOUT_DEREGISTRATION_STORE_SERVER_NAME  (6),
+  USER_DEREGISTRATION_STORE_SERVER_NAME     (7),
+  ADMINISTRATIVE_DEREGISTRATION             (8),
+  AUTHENTICATION_FAILURE                    (9),
+  AUTHENTICATION_TIMEOUT                   (10),
+  DEREGISTRATION_TOO_MUCH_DATA             (11),
+  AAA_USER_DATA_REQUEST                    (12),
+  PGW_UPDATE                               (13),
+  RESTORATION                              (14)
+}
+
+// 3GPP 29.229 V12.3.0
+// AVP: Deregistration-Reason (615) 3GPP (10415)
+// 6.3.16
+type AVP_Grouped Deregistration_Reason;
+
+// 3GPP 29.229 V12.3.0
+// AVP: Reason-Code (616) 3GPP (10415)
+// 6.3.17
+type enumerated Reason_Code
+{
+  PERMANENT_TERMINATION (0),
+  NEW_SERVER_ASSIGNED   (1),
+  SERVER_CHANGE         (2),
+  REMOVE_S_CSCF         (3)
+}
+
+// 3GPP 29.229 V12.3.0
+// AVP: Reason-Info (617) 3GPP (10415)
+// 6.3.18
+type AVP_UTF8String Reason_Info;
+
+// 3GPP 29.229 V12.3.0
+// AVP: Charging-Information (618) 3GPP (10415)
+// 6.3.19
+type AVP_Grouped Charging_Information;
+
+// 3GPP 29.229 V12.3.0
+// AVP: Primary-Event-Charging-Function-Name (619) 3GPP (10415)
+// 6.3.20
+type AVP_DiameterURI Primary_Event_Charging_Function_Name;
+
+// 3GPP 29.229 V12.3.0
+// AVP: Secondary-Event-Charging-Function-Name (620) 3GPP (10415)
+// 6.3.21
+type AVP_DiameterURI Secondary_Event_Charging_Function_Name;
+
+// 3GPP 29.229 V12.3.0
+// AVP: Primary-Charging-Collection-Function-Name (621) 3GPP (10415)
+// 6.3.22
+type AVP_DiameterURI Primary_Charging_Collection_Function_Name;
+
+// 3GPP 29.229 V12.3.0
+// AVP: Secondary-Charging-Collection-Function-Name (622) 3GPP (10415)
+// 6.3.23
+type AVP_DiameterURI Secondary_Charging_Collection_Function_Name;
+
+// 3GPP 29.229 V12.3.0
+// AVP: User-Authorization-Type (623) 3GPP (10415)
+// 6.3.24
+type enumerated User_Authorization_Type
+{
+  REGISTRATION                  (0),
+  DE_REGISTRATION               (1),
+  REGISTRATION_AND_CAPABILITIES (2)
+}
+
+// 3GPP 29.229 V12.3.0
+// AVP: User-Data-Already-Available (624) 3GPP (10415)
+// 6.3.26
+type enumerated User_Data_Already_Available
+{
+  USER_DATA_NOT_AVAILABLE     (0),
+  USER_DATA_ALREADY_AVAILABLE (1)
+}
+
+// 3GPP 29.229 V12.3.0
+// AVP: Confidentiality-Key (625) 3GPP (10415)
+// 6.3.27
+type AVP_OctetString Confidentiality_Key;
+
+// 3GPP 29.229 V12.3.0
+// AVP: Integrity-Key (626) 3GPP (10415)
+// 6.3.28
+type AVP_OctetString Integrity_Key;
+
+// 3GPP 29.229 V12.3.0
+// AVP: Supported-Features (628) 3GPP (10415)
+// 6.3.29
+type AVP_Grouped Supported_Features;
+
+// 3GPP 29.229 V12.3.0
+// AVP: Feature-List-ID (629) 3GPP (10415)
+// 6.3.30
+type AVP_Unsigned32 Feature_List_ID;
+
+// 3GPP 29.229 V12.3.0
+// AVP: Feature-List (630) 3GPP (10415)
+// 6.3.31
+type AVP_Unsigned32 Feature_List;
+
+// 3GPP 29.229 V12.3.0
+// AVP: Supported-Applications (631) 3GPP (10415)
+// 6.3.32
+type AVP_Grouped Supported_Applications;
+
+// 3GPP 29.229 V12.3.0
+// AVP: Associated-Identities (632) 3GPP (10415)
+// 6.3.33
+type AVP_Grouped Associated_Identities;
+
+// 3GPP TS 29.229 V12.3.0
+// AVP: Originating-Request (633) 3GPP (10415)
+// 6.3.34
+type enumerated Originating_Request
+{
+  ORIGINATING (0)
+}
+
+// 3GPP TS 29.229 V12.3.0
+// AVP: Wildcarded-Public-Identity (634) 3GPP (10415)
+// 6.3.35
+type AVP_UTF8String Wildcarded_Public_Identity;
+
+// 3GPP TS 29.229 V12.3.0
+// AVP: SIP-Digest-Authenticate (635) 3GPP (10415)
+// 6.3.36
+type AVP_Grouped SIP_Digest_Authenticate;
+
+// 3GPP 29.229 V12.3.0
+// AVP: Line-Identifier (500) ETSI (13019)
+// 6.3.42
+type AVP_OctetString Line_Identifier;
+
+// 3GPP TS 29.229 V12.3.0
+// AVP: UAR-Flags (637) 3GPP (10415)
+// 6.3.44
+type AVP_Unsigned32 UAR_Flags;
+
+// 3GPP TS 29.229 V12.3.0
+// AVP: Loose-Route-Indication (638) 3GPP (10415)
+// 6.3.45
+type enumerated Loose_Route_Indication
+{
+  LOOSE_ROUTE_NOT_REQUIRED (0),
+  LOOSE_ROUTE_REQUIRED     (1)
+}
+
+// 3GPP TS 29.229 V12.3.0
+// AVP: SCSCF-Restoration-Info (639) 3GPP (10415)
+// 6.3.46
+type AVP_Grouped SCSCF_Restoration_Info;
+
+// 3GPP TS 29.229 V12.3.0
+// AVP: Path (640) 3GPP (10415)
+// 6.3.47
+type AVP_OctetString Path;
+
+// 3GPP TS 29.229 V12.3.0
+// AVP: Contact (641) 3GPP (10415)
+// 6.3.48
+type AVP_OctetString Contact;
+
+// 3GPP TS 29.229 V12.3.0
+// AVP: Subscription-Info (642) 3GPP (10415)
+// 6.3.49
+type AVP_Grouped Subscription_Info;
+
+// 3GPP TS 29.229 V12.3.0
+// AVP: Call-ID-SIP-Header (643) 3GPP (10415)
+// 6.3.49.1
+type AVP_OctetString Call_ID_SIP_Header;
+
+// 3GPP TS 29.229 V12.3.0
+// AVP: From-SIP-Header (644) 3GPP (10415)
+// 6.3.49.2
+type AVP_OctetString From_SIP_Header;
+
+// 3GPP TS 29.229 V12.3.0
+// AVP: To-SIP-Header (645) 3GPP (10415)
+// 6.3.49.3
+type AVP_OctetString To_SIP_Header;
+
+// 3GPP TS 29.229 V12.3.0
+// AVP: Record-Route (646) 3GPP (10415)
+// 6.3.49.4
+type AVP_OctetString Record_Route;
+
+// 3GPP TS 29.229 V12.3.0
+// AVP: Associated-Registered-Identities (647) 3GPP (10415)
+// 6.3.50
+type AVP_Grouped Associated_Registered_Identities;
+
+// 3GPP TS 29.229 V12.3.0
+// AVP: Multiple-Registration-Indication (648) 3GPP (10415)
+// 6.3.51
+type enumerated Multiple_Registration_Indication
+{
+  NOT_MULTIPLE_REGISTRATION (0),
+  MULTIPLE_REGISTRATION     (1)
+}
+
+// 3GPP TS 29.229 V12.3.0
+// AVP: Restoration-Info (649) 3GPP (10415)
+// 6.3.52
+type AVP_Grouped Restoration_Info;
+
+// 3GPP TS 29.229 V12.3.0
+// AVP: Session-Priority (650) 3GPP (10415)
+// 6.3.56
+type enumerated Session_Priority
+{
+  PRIORITY_0 (0),
+  PRIORITY_1 (1),
+  PRIORITY_2 (2),
+  PRIORITY_3 (3),
+  PRIORITY_4 (4)
+}
+
+// 3GPP TS 29.229 V12.3.0
+// AVP: Identity-with-Emergency-Registration (651) 3GPP (10415)
+// 6.3.57
+type AVP_Grouped Identity_with_Emergency_Registration;
+
+// 3GPP TS 29.229 V12.3.0
+// AVP: Priviledged-Sender-Indication (652) 3GPP (10415)
+// 6.3.58
+type enumerated Priviledged_Sender_Indication
+{
+  NOT_PRIVILEDGED_SENDER (0),
+  PRIVILEDGED_SENDER     (1)
+}
+
+// 3GPP TS 29.229 V12.3.0
+// AVP: LIA-Flags (653) 3GPP (10415)
+// 6.3.59
+type AVP_Unsigned32 LIA_Flags;
+
+// 3GPP TS 29.229 V12.3.0
+// AVP: Initial-CSeq-Sequence-Number (654) 3GPP (10415)
+// 6.3.62
+type AVP_Unsigned32 Initial_CSeq_Sequence_Number;
+
+// 3GPP TS 29.229 V12.3.0
+// AVP: SAR-Flags (655) 3GPP (10415)
+// 6.3.63
+type AVP_Unsigned32 SAR_Flags;
+
diff --git a/src/CxDxInterface_Ericsson_1551_FAY301_0059_PC26.ddf b/src/CxDxInterface_Ericsson_1551_FAY301_0059_PC26.ddf
new file mode 100644
index 0000000000000000000000000000000000000000..44367a8101630f88cb7f0bab8baf6d53a474cc49
--- /dev/null
+++ b/src/CxDxInterface_Ericsson_1551_FAY301_0059_PC26.ddf
@@ -0,0 +1,196 @@
+/******************************************************************************
+* Copyright (c) 2004, 2014  Ericsson AB
+* All rights reserved. This program and the accompanying materials
+* are made available under the terms of the Eclipse Public License v1.0
+* which accompanies this distribution, and is available at
+* http://www.eclipse.org/legal/epl-v10.html
+*
+* Contributors:
+*   Roland Gecse - initial implementation and initial documentation
+*   Akos Pernek
+*   Antal Wuh.Hen.Chang
+*   Attila Fulop
+*   Balazs Barcsik
+*   Bence Molnar
+*   Csaba Koppany
+*   David Juhasz
+*   Eduard Czimbalmos
+*   Elemer Lelik
+*   Endre Kiss
+*   Endre Kulcsar
+*   Gabor Szalai
+*   Gabor Tatarka
+*   Gergely Futo
+*   Istvan Sandor
+*   Krisztian Pandi
+*   Kulcsár Endre
+*   Laszlo Tamas Zeke
+*   Norbert Pinter
+*   Roland Gecse
+*   Tibor Bende
+*   Tibor Szabo
+*   Timea Moder
+*   Zoltan Medve
+*   Zsolt Nandor Torok
+*   Zsolt Szalai
+******************************************************************************/
+//
+//  File:               EricssonProprietaryCxDx.ddf
+//  Description:        DDF for Cx according to 1551-FAY 301 0059 Uen
+//  Rev:                R34A
+//  Prodnr:             CNL 113 462
+///////////////////////////////////////////////
+
+
+// APPLICATION-NAME: ECX
+// APPLICATION-REVISION: PC26
+
+// AVP implementations according to: 
+// 1551-FAY 301 0059 Uen PC26 - Service Contract, Diameter Cx Application
+// Protocol details
+// IETF RFC 3588 - Diameter Base Protocol
+
+// 1551-FAY 301 0059 Uen PC26 	
+// AVP:	Application-Server-Name	(1001)	
+type AVP_OctetString Application_Server_Name;
+
+// 1551-FAY 301 0059 Uen PC26 	
+// AVP:	Authenticate (1019)	
+type AVP_OctetString Authenticate;
+
+// 1551-FAY 301 0059 Uen PC26	
+// AVP:	Authentication-Context (1024)	
+type AVP_OctetString Authentication_Context;
+
+// 1551-FAY 301 0059 Uen PC26	
+// AVP:	Auth-Data-Item (1018)	
+type AVP_Grouped Auth_Data_Item;
+
+// 1551-FAY 301 0059 Uen PC26	
+// AVP:	Authentication-Info (1023)	
+type AVP_OctetString Authentication_Info;
+
+// 1551-FAY 301 0059 Uen PC26	
+// AVP:	Authorization (1022)	
+type AVP_OctetString Authorization;
+
+// 1551-FAY 301 0059 Uen PC26	
+// AVP: Authentication-Scheme (1020)	
+type AVP_Unsigned32 Authentication_Scheme;
+
+// 1551-FAY 301 0059 Uen PC26	
+// AVP:	Condition-Negated (1033)	
+type enumerated Condition_Negated
+{
+  FALSE (0),
+  TRUE  (1)
+}
+
+// 1551-FAY 301 0059 Uen PC26	
+// AVP:	Condition-Type-CNF (1038)	
+type enumerated Condition_Type_CNF
+{
+  FALSE (0),
+  TRUE  (1)
+}
+
+// 1551-FAY 301 0059 Uen PC26	
+// AVP:	Indication (1002)	
+type AVP_Unsigned32 Indication;
+
+// 1551-FAY 301 0059 Uen PC26	
+// AVP:	Item-Number (1021)	
+type AVP_Unsigned32 Item_Number;
+
+// 1551-FAY 301 0059 Uen PC26	
+// AVP:	Max-No-Call-Legs-Per-Sessions (1003)	
+type AVP_Unsigned32 Max_No_Call_Legs_Per_Sessions;
+
+// 1551-FAY 301 0059 Uen PC26	
+// AVP:	Max-No-Simultaneous-Sessions-Allowed (1004)	
+type AVP_Unsigned32 Max_No_Simultaneous_Sessions_Allowed;
+
+// 1551-FAY 301 0059 Uen PC26	
+// AVP:	Method (1037)	
+type AVP_OctetString Method;
+
+// 1551-FAY 301 0059 Uen PC26	
+// AVP: Number-Authentication-Items (1026)	
+type AVP_Unsigned32 Number_Authentication_Items;
+
+// 1551-FAY 301 0059 Uen PC26	
+// AVP: P-CSCF-Name (1005)	
+type AVP_OctetString P_CSCF_Name;
+
+// 1551-FAY 301 0059 Uen PC26	
+// AVP: S-CSCF-Name-Originating	(1008)	
+type AVP_OctetString S_CSCF_Name_Originating;
+
+// 1551-FAY 301 0059 Uen PC26	
+// AVP: S-CSCF-Name-Terminating	(1009)	
+type AVP_OctetString S_CSCF_Name_Terminating;
+
+// 1551-FAY 301 0059 Uen PC26	
+// AVP: Server-Capability (1010)
+type AVP_OctetString Server_Capability;
+
+// 1551-FAY 301 0059 Uen PC26	
+// AVP: Session-Case (1034)	
+type AVP_Unsigned32 Session_Case;
+
+// 1551-FAY 301 0059 Uen PC26	
+// AVP: SIP-Server-Capabilities (1011)	
+type AVP_Grouped SIP_Server_Capabilities;
+
+// 1551-FAY 301 0059 Uen PC26	
+// AVP:	SIP-Server-Name (1012)	
+type AVP_Grouped SIP_Server_Name;
+
+// 1551-FAY 301 0059 Uen PC26	
+// AVP: SIP-Server-Operator-Preference (1013)	
+type AVP_Grouped SIP_Server_Operator_Preference;
+
+// 1551-FAY 301 0059 Uen PC26	
+// AVP:	Trigger-Detection-Point (1014)	
+type AVP_Grouped Trigger_Detection_Point;
+
+// 1551-FAY 301 0059 Uen PC26	
+// AVP:	Type-Of-Trigger	(1015)	
+type AVP_Grouped Type_Of_Trigger;
+
+// 1551-FAY 301 0059 Uen PC26	
+// AVP:	Trigger	(1016)	
+type AVP_Grouped Trigger;
+
+// 1551-FAY 301 0059 Uen PC26	
+// AVP:	User-Data (1017)	
+type AVP_Grouped User_Data;
+
+// 1551-FAY 301 0059 Uen PC26	
+// AVP:	SIP-Header (1027)	
+type AVP_Grouped SIP_Header;
+
+// 1551-FAY 301 0059 Uen PC26	
+// AVP:	SIP-Header-Name (1028)	
+type AVP_OctetString SIP_Header_Name;
+
+// 1551-FAY 301 0059 Uen PC26	
+// AVP: SIP-Header-Content (1029)	
+type AVP_OctetString SIP_Header_Content;
+
+// 1551-FAY 301 0059 Uen PC26	
+// AVP: Request-Uri (1030)	
+type AVP_Grouped Request_Uri;
+
+// 1551-FAY 301 0059 Uen PC26	
+// AVP: Request-Uri-SPT (1039)	
+type AVP_OctetString Request_Uri_SPT;
+
+// 1551-FAY 301 0059 Uen PC26	
+// AVP: Trigger-Priority (1031)	
+type AVP_Unsigned32 Trigger_Priority;
+
+// 1551-FAY 301 0059 Uen PC26	
+// AVP:	Phone-Context (1032)	
+type AVP_OctetString Phone_Context;
+
diff --git a/src/DIAMETER_EncDec.cc b/src/DIAMETER_EncDec.cc
index cd13211a2aaee1991523466c850c949805c02920..be4a70ba867bea96abbca22c7fdaa4232974dc1d 100644
--- a/src/DIAMETER_EncDec.cc
+++ b/src/DIAMETER_EncDec.cc
@@ -23,7 +23,7 @@
 *   Gergely Futo
 *   Istvan Sandor
 *   Krisztian Pandi
-*   Kulcsár Endre
+*   KulcsĂĄr Endre
 *   Laszlo Tamas Zeke
 *   Norbert Pinter
 *   Roland Gecse
@@ -37,95 +37,69 @@
 //
 //  File:               DIAMETER_EncDec.cc
 //  Description:	Encoder/Decoder and external functions for DPMG
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
 #include "DIAMETER_Types.hh"
 //#include <sys/timeb.h>
+#include <stdlib.h>
 #include <sys/time.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <stdint.h>
 
 namespace DIAMETER__Types{
 static const unsigned char os_h_or_e_id_octets[] = { 0, 0, 0, 0 };
 static const OCTETSTRING os_h_or_e_id_oct(4, os_h_or_e_id_octets);
 
-INTEGER f__DIAMETER__genHopByHop__int()
+
+INTEGER f__DIAMETER__genEndToEnd__int()
 {
-  INTEGER ret = 0;
-  //timeb precise;                        // requires <sys/timeb.h>
   timeval precise;                        // requires <sys/time.h>
-/*  if ( ftime(&precise) != -1 ) {
-    srand48(precise.time + precise.millitm);
-    ret = int2oct(lrand48(),4);
-  }*/
-  if ( gettimeofday(&precise, NULL) != -1 ) {
-    srand48(precise.tv_sec + precise.tv_usec);
-    ret.set_long_long_val(lrand48());
+  static bool inititalized = false;
+  static uint32_t l_value = 0;
+  if(!inititalized){
+    long int seed = getpid();
+    if ( gettimeofday(&precise, NULL) != -1 ) {
+      seed <<= 8;
+      seed +=  (precise.tv_sec) & 0xFF;
+      seed <<= 8;
+      seed +=  (precise.tv_usec) & 0xFF;
+    }
+    srand48(seed);
+    l_value =lrand48();
+    if ( gettimeofday(&precise, NULL) != -1 ) {
+      l_value = (((uint32_t)precise.tv_sec) << 20) + ( l_value >> 12);
+    }
+    inititalized = true;
+  }
+  
+  l_value+=1;  // unsigned int -> can be overflowed safely
+  
+  if(l_value==0){
+    l_value+=1;
   }
-  else TTCN_warning("f_DIAMETER_genHopByHop() returns with 0");
+  
+  INTEGER ret;
+  ret.set_long_long_val(l_value);
   return ret;
 }
-  
 
 
-OCTETSTRING f__DIAMETER__genHopByHop__oct()
+OCTETSTRING f__DIAMETER__genEndToEnd__oct()
 {
-//  OCTETSTRING ret = os_h_or_e_id_oct;
-  //timeb precise;                        // requires <sys/timeb.h>
-//  timeval precise;                        // requires <sys/time.h>
-/*  if ( ftime(&precise) != -1 ) {
-    srand48(precise.time + precise.millitm);
-    ret = int2oct(lrand48(),4);
-  }*/
-//  if ( gettimeofday(&precise, NULL) != -1 ) {
-//    srand48(precise.tv_sec + precise.tv_usec);
-//    ret = int2oct(lrand48(),4);
-//  }
-//  else TTCN_warning("f_DIAMETER_genHopByHop() returns with \'00000000\'O");
-  return int2oct(f__DIAMETER__genHopByHop__int(),4);
+  return int2oct(f__DIAMETER__genEndToEnd__int(),4);
 }
 
-INTEGER f__DIAMETER__genEndToEnd__int()
+INTEGER f__DIAMETER__genHopByHop__int()
 {
-  INTEGER ret = 0;
-  //timeb precise;                        // requires <sys/timeb.h>
-  timeval precise;                        // requires <sys/time.h>
-  /*if ( ftime(&precise) != -1 ) {
-    srand48(precise.time + precise.millitm);
-    int l_value = (precise.time << 20) + (lrand48() >> 12);
-    if (l_value < 0) l_value *= -1;
-    ret = int2oct(l_value,4);
-  }*/
-  if ( gettimeofday(&precise, NULL) != -1 ) {
-    srand48(precise.tv_sec + precise.tv_usec);
-    unsigned int l_value = (precise.tv_sec << 20) + (lrand48() >> 12);
-    ret.set_long_long_val(l_value);
-  }
-  else TTCN_warning("f_DIAMETER_genHopByHop() returns with 0");
-  return ret;
+  return f__DIAMETER__genEndToEnd__int();
 }
 
-
-OCTETSTRING f__DIAMETER__genEndToEnd__oct()
+OCTETSTRING f__DIAMETER__genHopByHop__oct()
 {
-//  OCTETSTRING ret = os_h_or_e_id_oct;
-  //timeb precise;                        // requires <sys/timeb.h>
-//  timeval precise;                        // requires <sys/time.h>
-  /*if ( ftime(&precise) != -1 ) {
-    srand48(precise.time + precise.millitm);
-    int l_value = (precise.time << 20) + (lrand48() >> 12);
-    if (l_value < 0) l_value *= -1;
-    ret = int2oct(l_value,4);
-  }*/
-//  if ( gettimeofday(&precise, NULL) != -1 ) {
-//    srand48(precise.tv_sec + precise.tv_usec);
-//    int l_value = (precise.tv_sec << 20) + (lrand48() >> 12);
-//    if (l_value < 0) l_value *= -1;
-//    ret = int2oct(l_value,4);
-//  }
-//  else TTCN_warning("f_DIAMETER_genHopByHop() returns with \'00000000\'O");
-//  return ret;
-  return int2oct(f__DIAMETER__genEndToEnd__int(),4);
+  return int2oct(f__DIAMETER__genHopByHop__int(),4);
 }
 
 bool chk_zero(INTEGER var) {return var==0;}
diff --git a/src/DIAMETER_EncDec.tpl b/src/DIAMETER_EncDec.tpl
index f19d514a72725e9267edeb6f0c17b6b03bb2a5f9..99baf012117dede1437f0c4aa32bb1823faac8c6 100644
--- a/src/DIAMETER_EncDec.tpl
+++ b/src/DIAMETER_EncDec.tpl
@@ -23,7 +23,7 @@
 *   Gergely Futo
 *   Istvan Sandor
 *   Krisztian Pandi
-*   Kulcsár Endre
+*   KulcsĂĄr Endre
 *   Laszlo Tamas Zeke
 *   Norbert Pinter
 *   Roland Gecse
@@ -36,9 +36,13 @@
 ******************************************************************************/
 
 #include "DIAMETER_Types.hh"
-#include <sys/time.h>
 #define BUF_SIZE 65536          // this buffer is used on data reception and outgoing encoding
 #include <math.h>
+#include <stdlib.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <stdint.h>
 
 
 namespace DIAMETER__Types{
@@ -259,44 +263,58 @@ void encode_float_8byte(unsigned char* &p, const double data) {
   p+=8;
 }
 
-INTEGER f__DIAMETER__genHopByHop__int()
+
+INTEGER f__DIAMETER__genEndToEnd__int()
 {
-  INTEGER ret = 0;
   timeval precise;                        // requires <sys/time.h>
-  if ( gettimeofday(&precise, NULL) != -1 ) {
-    srand48(precise.tv_sec + precise.tv_usec);
-    ret.set_long_long_val(lrand48());
+  static bool inititalized = false;
+  static uint32_t l_value = 0;
+  if(!inititalized){
+    long int seed = getpid();
+    if ( gettimeofday(&precise, NULL) != -1 ) {
+      seed <<= 8;
+      seed +=  (precise.tv_sec) & 0xFF;
+      seed <<= 8;
+      seed +=  (precise.tv_usec) & 0xFF;
+    }
+    srand48(seed);
+    l_value =lrand48();
+    if ( gettimeofday(&precise, NULL) != -1 ) {
+      l_value = (((uint32_t)precise.tv_sec) << 20) + ( l_value >> 12);
+    }
+    inititalized = true;
+  }
+  
+  l_value+=1;  // unsigned int -> can be overflowed safely
+  
+  if(l_value==0){
+    l_value+=1;
   }
-  else TTCN_warning("f_DIAMETER_genHopByHop() returns with 0");
+  
+  INTEGER ret;
+  ret.set_long_long_val(l_value);
   return ret;
 }
-  
 
 
-OCTETSTRING f__DIAMETER__genHopByHop__oct()
+OCTETSTRING f__DIAMETER__genEndToEnd__oct()
 {
-  return int2oct(f__DIAMETER__genHopByHop__int(),4);
+  return int2oct(f__DIAMETER__genEndToEnd__int(),4);
 }
 
-INTEGER f__DIAMETER__genEndToEnd__int()
+INTEGER f__DIAMETER__genHopByHop__int()
 {
-  INTEGER ret = 0;
-  timeval precise;                        // requires <sys/time.h>
-  if ( gettimeofday(&precise, NULL) != -1 ) {
-    srand48(precise.tv_sec + precise.tv_usec);
-    unsigned int l_value = (precise.tv_sec << 20) + (lrand48() >> 12);
-    ret.set_long_long_val(l_value);
-  }
-  else TTCN_warning("f_DIAMETER_genEndToEnd() returns with 0");
-  return ret;
+  return f__DIAMETER__genEndToEnd__int();
 }
+  
 
 
-OCTETSTRING f__DIAMETER__genEndToEnd__oct()
+OCTETSTRING f__DIAMETER__genHopByHop__oct()
 {
-  return int2oct(f__DIAMETER__genEndToEnd__int(),4);
+  return int2oct(f__DIAMETER__genHopByHop__int(),4);
 }
 
+
 bool chk_zero(const INTEGER& var) {return var==0;}
 bool chk_zero(const OCTETSTRING& var) {return var==os_h_or_e_id_oct;}
 
diff --git a/src/DelegatedIPv6Prefix_IETF_RFC4818.ddf b/src/DelegatedIPv6Prefix_IETF_RFC4818.ddf
new file mode 100644
index 0000000000000000000000000000000000000000..c563824849abd7a8506959fb1b727457108f65de
--- /dev/null
+++ b/src/DelegatedIPv6Prefix_IETF_RFC4818.ddf
@@ -0,0 +1,23 @@
+/******************************************************************************
+* Copyright (c) 2004, 2015  Ericsson AB
+* All rights reserved. This program and the accompanying materials
+* are made available under the terms of the Eclipse Public License v1.0
+* which accompanies this distribution, and is available at
+* http://www.eclipse.org/legal/epl-v10.html
+*
+* Contributors:
+*   Timea Moder
+******************************************************************************/
+//
+//  File:               DelegatedIPv6Prefix_IETF_RFC4818.ddf
+//  Description:        DDF for Delegated IPv6 Prefix to RFC 4818
+//  Rev:                R34A
+//  Prodnr:             CNL113462
+///////////////////////////////////////////////
+
+// APPLICATION-NAME: DIPv6P
+// APPLICATION-REVISION: RFC4818
+
+// RFC 4818 5.
+// AVP: Delegated-IPv6-Prefix (123)
+type AVP_OctetString Delegated_IPv6_Prefix;
diff --git a/src/DigestAuthentication_IETF_RFC5090.ddf b/src/DigestAuthentication_IETF_RFC5090.ddf
index 4f73b240bcff81586435fed52029516cf3df9b57..c6beeee5a162f04df3823e27328b34f02a3593c3 100644
--- a/src/DigestAuthentication_IETF_RFC5090.ddf
+++ b/src/DigestAuthentication_IETF_RFC5090.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               DigestAuthentication_IETF_RFC5090.ddf
 //  Description:        DDF for DIGEST according to RFC 5090
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 1134 62
 ///////////////////////////////////////////////
 
diff --git a/src/EricssonSCAPv1_1553APR_10148.ddf b/src/EricssonSCAPv1_1553APR_10148.ddf
index b175a6dd3629e7f681c926b3840492f0cc1f2902..459cd0c45401b4813ebad2376ec50a50c125cd81 100644
--- a/src/EricssonSCAPv1_1553APR_10148.ddf
+++ b/src/EricssonSCAPv1_1553APR_10148.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               EricssonSCAPv1_1553APR_10148.ddf
 //  Description:        DDF for SCAPv1 according to 2/1553-APR 101 48/2
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/Ericsson_Specific_AVPs.ddf b/src/Ericsson_Specific_AVPs.ddf
index 5968a667c2c3dd0d6abf916619d77e74b325a05c..87226bffaf767402d3464c46794508b8f7d83cab 100644
--- a/src/Ericsson_Specific_AVPs.ddf
+++ b/src/Ericsson_Specific_AVPs.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               Ericsson_Specific_AVPs.ddf
 //  Description:        Ericsson specific AVP definitions
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 //  Reference:          http://snmp.ericsson.se/diameter-assignments.html
 //
diff --git a/src/GiInterface_3GPP_TS29061_770.ddf b/src/GiInterface_3GPP_TS29061_770.ddf
index 278fd7405ed5ade9cdd4829e23c73db6e8b9751d..e947afe5cb8e769798b1d26fdd6b1fd45d7eb7fd 100644
--- a/src/GiInterface_3GPP_TS29061_770.ddf
+++ b/src/GiInterface_3GPP_TS29061_770.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               GiInterface_3GPP_TS29061_770.ddf
 //  Description:        DDF for Gi according to 3GPP TS 29.061 V7.7.0
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/GiSGiInterface_3GPP_TS29061_810.ddf b/src/GiSGiInterface_3GPP_TS29061_810.ddf
index f870522e672a98bb7166e7d325fc69c6b96b80d2..e0d14e52c0f53b5153dd6989d94a9c81ad1be323 100644
--- a/src/GiSGiInterface_3GPP_TS29061_810.ddf
+++ b/src/GiSGiInterface_3GPP_TS29061_810.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               GiSGiInterface_3GPP_TS29061_810.ddf
 //  Description:        DDF for Gi/SGi according to 3GPP TS 29.061 V8.1.0
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/GiSGiInterface_3GPP_TS29061_930.ddf b/src/GiSGiInterface_3GPP_TS29061_930.ddf
index 88e7fb273f7bc9daea63e5cdfdb6b93557275388..a3470f8fdf7d3f69d3b5b42e5880707cc8c0281c 100644
--- a/src/GiSGiInterface_3GPP_TS29061_930.ddf
+++ b/src/GiSGiInterface_3GPP_TS29061_930.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               GiSGiInterface_3GPP_TS29061_930.ddf
 //  Description:        DDF for Gi/SGi according to 3GPP TS 29.061 V9.3.0
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/GiSGiInterface_3GPP_TS29061_930_QoS_Detailed.ddf b/src/GiSGiInterface_3GPP_TS29061_930_QoS_Detailed.ddf
index 2b5ebe197685f8decc31180d0b6ff08c22d7b9f0..dc64e12205b6248b8247a8c2ac91e86d923f8469 100644
--- a/src/GiSGiInterface_3GPP_TS29061_930_QoS_Detailed.ddf
+++ b/src/GiSGiInterface_3GPP_TS29061_930_QoS_Detailed.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               GiSGiInterface_3GPP_TS29061_930_QoS_Detailed.ddf
 //  Description:        DDF for Gi/SGi according to 3GPP TS 29.061 V9.3.0
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/GiSGiInterface_3GPP_TS29061_980.ddf b/src/GiSGiInterface_3GPP_TS29061_980.ddf
index dc6316ca3947baa4368cd42b2a78603e6796a2c5..f959532e5cdc0291db98590d28171d8dabce3ec2 100644
--- a/src/GiSGiInterface_3GPP_TS29061_980.ddf
+++ b/src/GiSGiInterface_3GPP_TS29061_980.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               GiSGiInterface_3GPP_TS29061_980.ddf
 //  Description:        DDF for Gi/SGi according to 3GPP TS 29.061 V9.8.0
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/GiSGiInterface_3GPP_TS29061_b90.ddf b/src/GiSGiInterface_3GPP_TS29061_b90.ddf
new file mode 100644
index 0000000000000000000000000000000000000000..ea7c973ec8094db0263d7a13f2ad027949f0260e
--- /dev/null
+++ b/src/GiSGiInterface_3GPP_TS29061_b90.ddf
@@ -0,0 +1,219 @@
+/******************************************************************************
+* Copyright (c) 2004, 2015  Ericsson AB
+* All rights reserved. This program and the accompanying materials
+* are made available under the terms of the Eclipse Public License v1.0
+* which accompanies this distribution, and is available at
+* http://www.eclipse.org/legal/epl-v10.html
+*
+* Contributors:
+*   Timea Moder
+******************************************************************************/
+//
+//  File:               GiSGiInterface_3GPP_TS29061_b90.ddf
+//  Description:        DDF for Gi/SGi according to 3GPP TS 29.061 V11.9.0
+//  Rev:                R34A
+//  Prodnr:             CNL 113 462
+///////////////////////////////////////////////
+
+
+// APPLICATION-NAME: GI
+// APPLICATION-REVISION: V11_9_0
+
+// AVP implementations according to: 
+// 3GPP TS 29.061 V11.9.0 - Interworking between the Public Land Mobile Network (PLMN) supporting packet based services and Packet Data Networks (PDN)
+//
+//
+// Dependant applications
+// -
+
+
+// 3GPP TS 29.061 V11.9.0 16a.4
+type enumerated Command_Code 
+{
+  Authorize_Authenticate (265),
+  Session_Termination    (275),
+  Abort_Session          (274),
+  Accounting             (271)
+}
+
+
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: 3GPP-IMSI (1) 3GPP (10415)
+// 16.4.7
+type AVP_UTF8String 3GPP_IMSI;
+
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: 3GPP-Charging-Id (2) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString 3GPP_Charging_Id;
+
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: 3GPP-PDP-Type (3) 3GPP (10415)
+// 16.4.7
+type enumerated 3GPP_PDP_Type
+{
+  IPv4   (0),
+  PPP    (1),
+  IPv6   (2),
+  IPv4v6 (3)
+}
+
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: 3GPP-CG-Address (4) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString 3GPP_CG_Address;
+
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: 3GPP-GPRS-Negotiated-QoS-Profile (5) 3GPP (10415)
+// 16.4.7
+type AVP_UTF8String 3GPP_GPRS_Negotiated_QoS_Profile;
+
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: 3GPP-SGSN-Address (6) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString 3GPP_SGSN_Address;
+
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: 3GPP-GGSN-Address (7) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString 3GPP_GGSN_Address;
+
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: 3GPP-IMSI-MCC-MNC (8) 3GPP (10415)
+// 16.4.7
+type AVP_UTF8String 3GPP_IMSI_MCC_MNC;
+
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: 3GPP-GGSN-MCC-MNC (9) 3GPP (10415)
+// 16.4.7
+type AVP_UTF8String 3GPP_GGSN_MCC_MNC;
+
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: 3GPP-NSAPI (10) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString 3GPP_NSAPI;
+
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: 3GPP-Session-Stop-Indicator (11) 3GPP (10415)
+type AVP_UTF8String 3GPP_Session_Stop_Indicator;
+
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: 3GPP-Selection-Mode (12) 3GPP (10415)
+// 16.4.7
+type AVP_UTF8String 3GPP_Selection_Mode;
+
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: 3GPP-Charging-Characteristics (13) 3GPP (10415)
+// 16.4.7
+type AVP_UTF8String 3GPP_Charging_Characteristics;
+
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: 3GPP-CG-IPv6-Address (14) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString 3GPP_CG_IPv6_Address;
+
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: 3GPP-SGSN-IPv6-Address (15) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString 3GPP_SGSN_IPv6_Address;
+
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: 3GPP-GGSN-IPv6-Address (16) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString 3GPP_GGSN_IPv6_Address;
+
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: 3GPP-IPv6-DNS-Servers (17) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString 3GPP_IPv6_DNS_Servers;
+
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: 3GPP-SGSN-MCC-MNC (18) 3GPP (10415)
+// 16.4.7
+type AVP_UTF8String 3GPP_SGSN_MCC_MNC;
+
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: 3GPP-IMEISV (20) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString 3GPP_IMEISV;
+
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: 3GPP-RAT-Type (21) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString 3GPP_RAT_Type;
+
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: 3GPP-User-Location-Info (22) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString 3GPP_User_Location_Info;
+
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: 3GPP-MS-TimeZone (23) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString 3GPP_MS_TimeZone;
+
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: 3GPP-CAMEL-Charging-Info (24) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString 3GPP_CAMEL_Charging_Info;
+
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: 3GPP-Packet-Filter (25) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString 3GPP_Packet_Filter;
+
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: 3GPP-Negotiated-DSCP (26) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString 3GPP_Negotiated_DSCP;
+
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: 3GPP-Allocate-IP-Type (27) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString 3GPP_Allocate_IP_Type;
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: External-Identifier (28) 3GPP (10415)
+// 16.4.7
+type AVP_UTF8String External_Identifier;
+
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: TWAN-Identifier (29) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString TWAN_Identifier;
+
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: 3GPP-User-Location-Info-Time (30) 3GPP (10415)
+// 16.4.7
+type AVP_Unsigned32 3GPP_User_Location_Info_Time;
+
+
+
diff --git a/src/GiSGiInterface_3GPP_TS29061_b90_QoS_Detailed.ddf b/src/GiSGiInterface_3GPP_TS29061_b90_QoS_Detailed.ddf
new file mode 100644
index 0000000000000000000000000000000000000000..0322c28bd1cab71293c56a9de634326daae404e5
--- /dev/null
+++ b/src/GiSGiInterface_3GPP_TS29061_b90_QoS_Detailed.ddf
@@ -0,0 +1,360 @@
+/******************************************************************************
+* Copyright (c) 2004, 2014  Ericsson AB
+* All rights reserved. This program and the accompanying materials
+* are made available under the terms of the Eclipse Public License v1.0
+* which accompanies this distribution, and is available at
+* http://www.eclipse.org/legal/epl-v10.html
+*
+* Contributors:
+*   Timea Moder
+******************************************************************************/
+//
+//  File:               GiSGiInterface_3GPP_TS29061_b90_QoS_Detailed.ddf
+//  Description:        DDF for Gi/SGi according to 3GPP TS 29.061 V11.9.0
+//  Rev:                R34A
+//  Prodnr:             CNL 113 462
+///////////////////////////////////////////////
+
+
+// APPLICATION-NAME: GI
+// APPLICATION-REVISION: V11_9_0
+
+// AVP implementations according to: 
+// 3GPP TS 29.061 V11.9.0 - Interworking between the Public Land Mobile Network (PLMN) supporting packet based services and Packet Data Networks (PDN)
+//
+//
+// Dependant applications
+// -
+
+// 3GPP TS 29.061 V11.9.0 16a.4
+type enumerated Command_Code 
+{
+  Authorize_Authenticate (265),
+  Session_Termination    (275),
+  Abort_Session          (274),
+  Accounting             (271)
+}
+
+
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: 3GPP-IMSI (1) 3GPP (10415)
+// 16.4.7
+type AVP_UTF8String 3GPP_IMSI;
+
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: 3GPP-Charging-Id (2) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString 3GPP_Charging_Id;
+
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: 3GPP-PDP-Type (3) 3GPP (10415)
+// 16.4.7
+type enumerated 3GPP_PDP_Type
+{
+  IPv4   (0),
+  PPP    (1),
+  IPv6   (2),
+  IPv4v6 (3)
+}
+
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: 3GPP-CG-Address (4) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString 3GPP_CG_Address;
+
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: 3GPP-GPRS-Negotiated-QoS-Profile (5) 3GPP (10415)
+// 16.4.7
+type GPRS_Negotiated_QoS_Profile 3GPP_GPRS_Negotiated_QoS_Profile;
+
+// EXT_CC: GiSGiInterface_3GPP_TS29061_930_QoS_Detailed.tpl
+
+modulepar boolean Negotiated_QoS_Profile_decode_as_detailed:=false;
+
+type union GPRS_Negotiated_QoS_Profile{
+  AVP_UTF8String                       raw_QoS_Profile,
+  GPRS_Negotiated_QoS_Profile_detailed QoS_Profile_detailed
+}
+
+type record GPRS_Negotiated_QoS_Profile_detailed{
+  charstring        qos_profile_header length(3),
+  AVP_qos_profile   qos_profile_data
+} with {
+  variant (qos_profile_data) "CROSSTAG(
+                                rel98, qos_profile_header=\"98-\";
+                                rel99, qos_profile_header=\"99-\";
+                                rel05, qos_profile_header=\"05-\";
+                                rel07, qos_profile_header=\"07-\";
+                                
+                              )"
+}
+
+type union AVP_qos_profile
+{
+  qos_rel98_t  rel98,
+  qos_rel99_t  rel99,
+  qos_rel05_t  rel05,
+  qos_rel07_t  rel07
+}
+
+type bitstring BITSTR1 length(1) with { variant "FIELDLENGTH(1)" };
+type bitstring BITSTR2 length(2) with { variant "FIELDLENGTH(2)" };
+type bitstring BITSTR3 length(3) with { variant "FIELDLENGTH(3)" };
+type bitstring BITSTR4 length(4) with { variant "FIELDLENGTH(4)" };
+type bitstring BITSTR5 length(5) with { variant "FIELDLENGTH(5)" };
+type bitstring BITSTR6 length(6) with { variant "FIELDLENGTH(6)" };
+type octetstring OCTSTR1 length(1) with { variant "FIELDLENGTH(1)" };
+
+type record qos_rel98_t // 3GPP 24.008 v3.0.0
+{
+  BITSTR3                reliabilityClass,
+  BITSTR3                delayClass,
+  BITSTR2                spare1,  // '00'B
+  BITSTR3                precedenceClass,
+  BITSTR1                spare2,
+  BITSTR4                peakThroughput,
+  BITSTR5                meanThroughput,
+  BITSTR3                spare3
+} with {variant ""}
+
+type record qos_rel99_t // 3GPP 24.008 v4.16.0
+{
+  BITSTR3                reliabilityClass,
+  BITSTR3                delayClass,
+  BITSTR2                spare1,  // '00'B
+  BITSTR3                precedenceClass,
+  BITSTR1                spare2,
+  BITSTR4                peakThroughput,
+  BITSTR5                meanThroughput,
+  BITSTR3                spare3,
+  BITSTR3                deliverErroneusSDU,
+  BITSTR2                deliveryOrder,
+  BITSTR3                trafficClass,
+  OCTSTR1                maxSDUSize,
+  OCTSTR1                maxBitrateUplink,
+  OCTSTR1                maxBitrateDownlink,
+  BITSTR4                sduErrorRatio,
+  BITSTR4                residualBER,
+  BITSTR2                trafficHandlingPriority,
+  BITSTR6                transferDelay,
+  OCTSTR1                guaranteedBitRateUplink,
+  OCTSTR1                guaranteedBitRateDownlink
+} with {variant ""}
+
+type record qos_rel05_t // 3GPP 24.008 v6.12.0
+{
+  BITSTR3                reliabilityClass,
+  BITSTR3                delayClass,
+  BITSTR2                spare1,  // '00'B
+  BITSTR3                precedenceClass,
+  BITSTR1                spare2,
+  BITSTR4                peakThroughput,
+  BITSTR5                meanThroughput,
+  BITSTR3                spare3,
+  BITSTR3                deliverErroneusSDU,
+  BITSTR2                deliveryOrder,
+  BITSTR3                trafficClass,
+  OCTSTR1                maxSDUSize,
+  OCTSTR1                maxBitrateUplink,
+  OCTSTR1                maxBitrateDownlink,
+  BITSTR4                sduErrorRatio,
+  BITSTR4                residualBER,
+  BITSTR2                trafficHandlingPriority,
+  BITSTR6                transferDelay,
+  OCTSTR1                guaranteedBitRateUplink,
+  OCTSTR1                guaranteedBitRateDownlink,
+  BITSTR4                sourceStatisticsDescriptor,
+  BITSTR1                signallingIndication,
+  BITSTR3                spare4,
+  OCTSTR1                maxBitRateDownlinkExtended,
+  OCTSTR1                guaranteedBitRateDownlinkExtended
+} with {variant ""}
+
+type record qos_rel07_t
+{
+  BITSTR3                reliabilityClass,
+  BITSTR3                delayClass,
+  BITSTR2                spare1,  // '00'B
+  BITSTR3                precedenceClass,
+  BITSTR1                spare2,
+  BITSTR4                peakThroughput,
+  BITSTR5                meanThroughput,
+  BITSTR3                spare3,
+  BITSTR3                deliverErroneusSDU optional,
+  BITSTR2                deliveryOrder optional,
+  BITSTR3                trafficClass optional,
+  OCTSTR1                maxSDUSize optional,
+  OCTSTR1                maxBitrateUplink optional,
+  OCTSTR1                maxBitrateDownlink optional,
+  BITSTR4                sduErrorRatio optional,
+  BITSTR4                residualBER optional,
+  BITSTR2                trafficHandlingPriority optional,
+  BITSTR6                transferDelay optional,
+  OCTSTR1                guaranteedBitRateUplink optional,
+  OCTSTR1                guaranteedBitRateDownlink optional,
+  BITSTR4                sourceStatisticsDescriptor optional,
+  BITSTR1                signallingIndication optional,
+  BITSTR3                spare4 optional,
+  OCTSTR1                maxBitRateDownlinkExtended optional,
+  OCTSTR1                guaranteedBitRateDownlinkExtended optional,
+  OCTSTR1                maxBitRateUplinkExtended optional,
+  OCTSTR1                guaranteedBitRateUplinkExtended  optional
+} with {variant ""}
+
+external function f_decode_qos_rel98(in octetstring stream, out qos_rel98_t pdu) return integer
+with { extension "prototype(backtrack) decode(RAW)" };
+external function f_decode_qos_rel99(in octetstring stream, out qos_rel99_t pdu) return integer
+with { extension "prototype(backtrack) decode(RAW)" };
+external function f_decode_qos_rel05(in octetstring stream, out qos_rel05_t pdu) return integer
+with { extension "prototype(backtrack) decode(RAW)" };
+external function f_decode_qos_rel07(in octetstring stream, out qos_rel07_t pdu) return integer
+with { extension "prototype(backtrack) decode(RAW)" };
+external function f_enc_AVP_qos_profile(in AVP_qos_profile pdu) return octetstring
+with { extension "prototype(convert) encode(RAW)" };
+
+external function f_handle_QoS_Profile(inout GPRS_Negotiated_QoS_Profile pl_pdu)
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: 3GPP-SGSN-Address (6) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString 3GPP_SGSN_Address;
+
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: 3GPP-GGSN-Address (7) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString 3GPP_GGSN_Address;
+
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: 3GPP-IMSI-MCC-MNC (8) 3GPP (10415)
+// 16.4.7
+type AVP_UTF8String 3GPP_IMSI_MCC_MNC;
+
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: 3GPP-GGSN-MCC-MNC (9) 3GPP (10415)
+// 16.4.7
+type AVP_UTF8String 3GPP_GGSN_MCC_MNC;
+
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: 3GPP-NSAPI (10) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString 3GPP_NSAPI;
+
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: 3GPP-Session-Stop-Indicator (11) 3GPP (10415)
+type AVP_UTF8String 3GPP_Session_Stop_Indicator;
+
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: 3GPP-Selection-Mode (12) 3GPP (10415)
+// 16.4.7
+type AVP_UTF8String 3GPP_Selection_Mode;
+
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: 3GPP-Charging-Characteristics (13) 3GPP (10415)
+// 16.4.7
+type AVP_UTF8String 3GPP_Charging_Characteristics;
+
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: 3GPP-CG-IPv6-Address (14) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString 3GPP_CG_IPv6_Address;
+
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: 3GPP-SGSN-IPv6-Address (15) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString 3GPP_SGSN_IPv6_Address;
+
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: 3GPP-GGSN-IPv6-Address (16) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString 3GPP_GGSN_IPv6_Address;
+
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: 3GPP-IPv6-DNS-Servers (17) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString 3GPP_IPv6_DNS_Servers;
+
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: 3GPP-SGSN-MCC-MNC (18) 3GPP (10415)
+// 16.4.7
+type AVP_UTF8String 3GPP_SGSN_MCC_MNC;
+
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: 3GPP-IMEISV (20) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString 3GPP_IMEISV;
+
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: 3GPP-RAT-Type (21) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString 3GPP_RAT_Type;
+
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: 3GPP-User-Location-Info (22) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString 3GPP_User_Location_Info;
+
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: 3GPP-MS-TimeZone (23) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString 3GPP_MS_TimeZone;
+
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: 3GPP-CAMEL-Charging-Info (24) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString 3GPP_CAMEL_Charging_Info;
+
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: 3GPP-Packet-Filter (25) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString 3GPP_Packet_Filter;
+
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: 3GPP-Negotiated-DSCP (26) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString 3GPP_Negotiated_DSCP;
+
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: 3GPP-Allocate-IP-Type (27) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString 3GPP_Allocate_IP_Type;
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: External-Identifier (28) 3GPP (10415)
+// 16.4.7
+type AVP_UTF8String External_Identifier;
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: TWAN-Identifier (29) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString TWAN_Identifier;
+
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: 3GPP-User-Location-Info-Time (30) 3GPP (10415)
+// 16.4.7
+type AVP_Unsigned32 3GPP_User_Location_Info_Time;
diff --git a/src/GmbInterface_3GPP_TS29061_6f0.ddf b/src/GmbInterface_3GPP_TS29061_6f0.ddf
index ff6b6c455dbdc79942e4a95a7442e5a2e1baa5fb..b49aa0f1008dc0681cbd4f9257c20923e762372d 100644
--- a/src/GmbInterface_3GPP_TS29061_6f0.ddf
+++ b/src/GmbInterface_3GPP_TS29061_6f0.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               GmbInterface_3GPP_TS29061_6f0.ddf
 //  Description:        DDF for Gmb according to 3GPP TS 29.061 V6.15.0
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/GmbInterface_3GPP_TS29061_720.ddf b/src/GmbInterface_3GPP_TS29061_720.ddf
index 129f848bdb93d7060fd83cbcf69d1f06d5b39b46..0d0cb26579167124d692e48c9c82271a2541f405 100644
--- a/src/GmbInterface_3GPP_TS29061_720.ddf
+++ b/src/GmbInterface_3GPP_TS29061_720.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               GmbInterface_3GPP_TS29061_720.ddf
 //  Description:        DDF for Gmb according to 3GPP TS 29.061 V7.2.0
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/GmbInterface_3GPP_TS29061_810.ddf b/src/GmbInterface_3GPP_TS29061_810.ddf
index ff06ab4674d39bee5c685f4ada5d970d84ca23ae..ea5ae2b73f3375b234a4f9b5c6c2be6891febd5f 100644
--- a/src/GmbInterface_3GPP_TS29061_810.ddf
+++ b/src/GmbInterface_3GPP_TS29061_810.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               GmbInterface_3GPP_TS29061_810.ddf
 //  Description:        DDF for Gmb according to 3GPP TS 29.061 V8.1.0
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/GmbInterface_3GPP_TS29061_930.ddf b/src/GmbInterface_3GPP_TS29061_930.ddf
index 9aed08977fdfb258fd111b941ace61d619cab3cc..e9a1c48291bbe7cca3fbb8e68d0e9f8615e6fe31 100644
--- a/src/GmbInterface_3GPP_TS29061_930.ddf
+++ b/src/GmbInterface_3GPP_TS29061_930.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               GmbInterface_3GPP_TS29061_930.ddf
 //  Description:        DDF for Gmb according to 3GPP TS 29.061 V9.3.0
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/GmbInterface_3GPP_TS29061_970.ddf b/src/GmbInterface_3GPP_TS29061_970.ddf
index 241d60c7b19a85470487c8eea2ddb019667269da..e13803b3fa74d5b9b1ac64504602fbf0d188cea6 100644
--- a/src/GmbInterface_3GPP_TS29061_970.ddf
+++ b/src/GmbInterface_3GPP_TS29061_970.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               GmbInterface_3GPP_TS29061_970.ddf
 //  Description:        DDF for Gmb according to 3GPP TS 29.061 V9.7.0
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/GmbInterface_3GPP_TS29061_980.ddf b/src/GmbInterface_3GPP_TS29061_980.ddf
index b1176ac5681a4dc94d630693c19571a78d428536..d46f0f4aa346b31f0494f9d82e9fb797f309a3b9 100644
--- a/src/GmbInterface_3GPP_TS29061_980.ddf
+++ b/src/GmbInterface_3GPP_TS29061_980.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               GmbInterface_3GPP_TS29061_980.ddf
 //  Description:        DDF for Gmb according to 3GPP TS 29.061 V9.8.0
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/GqInterface_PC_3GPP_TS29209_670.ddf b/src/GqInterface_PC_3GPP_TS29209_670.ddf
index 22045452dfdcf179770d185093226475547ca2a3..33e14d3415ea68be44653fc7c73efc80aea6d72b 100644
--- a/src/GqInterface_PC_3GPP_TS29209_670.ddf
+++ b/src/GqInterface_PC_3GPP_TS29209_670.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               GqInterface_PC_3GPP_TS29209_670.ddf
 //  Description:        DDF for Gq according to 3GPP TS 29.209 V6.7.0
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/GqInterface_S3_ETSI_TS183017_231.ddf b/src/GqInterface_S3_ETSI_TS183017_231.ddf
index 170f3068a98a0526ad6b82169792492b8bb3f48f..f4a5ee1ca711030c22fbd9021de8aab941ac7422 100644
--- a/src/GqInterface_S3_ETSI_TS183017_231.ddf
+++ b/src/GqInterface_S3_ETSI_TS183017_231.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               GqInterface_S3_ETSI_TS183017_231.ddf
 //  Description:        DDF for Gq according to ETSI TS 183.017 V2.3.1
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/GxInterface_CRP_3GPP_TS29210_670.ddf b/src/GxInterface_CRP_3GPP_TS29210_670.ddf
index 5d8e21398c93c89fb7c97c97a36a8f334a730f65..ebc51e0cbc339b4106b2f22488328915a530c469 100644
--- a/src/GxInterface_CRP_3GPP_TS29210_670.ddf
+++ b/src/GxInterface_CRP_3GPP_TS29210_670.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               GxInterface_CRP_3GPP_TS29210_670.ddf
 //  Description:        DDF for Gx according to 3GPP TS 29.210 V6.7.0
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/GxInterface_PCC_3GPP_TS29212_740.ddf b/src/GxInterface_PCC_3GPP_TS29212_740.ddf
index eda4be37178694dba70cfc16ab7c70d52dfef8f1..62f0cbfc641e58a163860c6db9b2cad16ad24143 100644
--- a/src/GxInterface_PCC_3GPP_TS29212_740.ddf
+++ b/src/GxInterface_PCC_3GPP_TS29212_740.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               GxInterface_PCC_3GPP_TS29212_740.ddf
 //  Description:        DDF for Gx according to 3GPP TS 29.212 V7.4.0
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/GxInterface_PCC_3GPP_TS29212_820.ddf b/src/GxInterface_PCC_3GPP_TS29212_820.ddf
index 16ff8fd31a7b5999800513effc7c58fa95fd2bd2..00ccf547a57e0a111d16c478b12ed2d438f6611e 100644
--- a/src/GxInterface_PCC_3GPP_TS29212_820.ddf
+++ b/src/GxInterface_PCC_3GPP_TS29212_820.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               GxInterface_PCC_3GPP_TS29212_820.ddf
 //  Description:        DDF for Gx according to 3GPP TS 29.212 V8.2.0
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/GxInterface_PCC_3GPP_TS29212_830.ddf b/src/GxInterface_PCC_3GPP_TS29212_830.ddf
index 18c97ec4fb41bd0006ce42e066feaeead9321bdc..2c1e518d1ce138443f6427053df3b311a9fbcaa1 100644
--- a/src/GxInterface_PCC_3GPP_TS29212_830.ddf
+++ b/src/GxInterface_PCC_3GPP_TS29212_830.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               GxInterface_PCC_3GPP_TS29212_830.ddf
 //  Description:        DDF for Gx according to 3GPP TS 29.212 V8.3.0
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/GxInterface_PCC_3GPP_TS29212_840.ddf b/src/GxInterface_PCC_3GPP_TS29212_840.ddf
index 7a7b0db60acc82a2a9f754a501a0806eb6927d81..d33f938dacbcb1c467796a0122ce3adba8da770b 100644
--- a/src/GxInterface_PCC_3GPP_TS29212_840.ddf
+++ b/src/GxInterface_PCC_3GPP_TS29212_840.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               GxInterface_PCC_3GPP_TS29212_840.ddf
 //  Description:        DDF for Gx according to 3GPP TS 29.212 V8.4.0
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/GxInterface_PCC_3GPP_TS29212_8a0.ddf b/src/GxInterface_PCC_3GPP_TS29212_8a0.ddf
index 6c6d2c3ce64c57a9262486c879e5c1b564a77ef8..5e2d96eff2df6df1d335bdacda916ed164e77687 100644
--- a/src/GxInterface_PCC_3GPP_TS29212_8a0.ddf
+++ b/src/GxInterface_PCC_3GPP_TS29212_8a0.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               GxInterface_PCC_3GPP_TS29212_8a0.ddf
 //  Description:        DDF for Gx according to 3GPP TS 29.212 V8.10.0
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/GxInterface_PCC_3GPP_TS29212_8b1.ddf b/src/GxInterface_PCC_3GPP_TS29212_8b1.ddf
index cb287e71c0ffa541daac05cbbc66343c11aae32b..6cd6ab7566fcb0966f78c78ff25fc90f3580b724 100644
--- a/src/GxInterface_PCC_3GPP_TS29212_8b1.ddf
+++ b/src/GxInterface_PCC_3GPP_TS29212_8b1.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               GxInterface_PCC_3GPP_TS29212_8b1.ddf
 //  Description:        DDF for Gx according to 3GPP TS 29.212 V8.11.1
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/GxInterface_PCC_3GPP_TS29212_910.ddf b/src/GxInterface_PCC_3GPP_TS29212_910.ddf
index 546a496fded4cc196144f5d49a141ad60125f44a..ffc5adacdf5af0a4de76e01dc88c34bf455cb396 100644
--- a/src/GxInterface_PCC_3GPP_TS29212_910.ddf
+++ b/src/GxInterface_PCC_3GPP_TS29212_910.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               GxInterface_PCC_3GPP_TS29212_910.ddf
 //  Description:        DDF for Gx according to 3GPP TS 29.212 V9.1.0
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/GxInterface_PCC_3GPP_TS29212_930.ddf b/src/GxInterface_PCC_3GPP_TS29212_930.ddf
index 5e8536db844c075bda05cc75202b8911dfec3372..f1bfa7dca8baa8c06b323aedb028729a1b50d3de 100644
--- a/src/GxInterface_PCC_3GPP_TS29212_930.ddf
+++ b/src/GxInterface_PCC_3GPP_TS29212_930.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               GxInterface_PCC_3GPP_TS29212_930.ddf
 //  Description:        DDF for Gx according to 3GPP TS 29.212 V9.3.0
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/GxInterface_PCC_3GPP_TS29212_970.ddf b/src/GxInterface_PCC_3GPP_TS29212_970.ddf
index 727b585ae117dfb1b9c5ff3af3c365ffdff27f4a..56676c62f565bf2c1f0084e86b382bc91e93c4fb 100644
--- a/src/GxInterface_PCC_3GPP_TS29212_970.ddf
+++ b/src/GxInterface_PCC_3GPP_TS29212_970.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               GxInterface_PCC_3GPP_TS29212_930.ddf
 //  Description:        DDF for Gx according to 3GPP TS 29.212 V9.5.0
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/GxInterface_PCC_3GPP_TS29212_9b0.ddf b/src/GxInterface_PCC_3GPP_TS29212_9b0.ddf
index 5f660dc7c1c8a47fc0ba5faa41f5f1fdcd20e425..645c48109700cde468cb548314c25ab0809f69ed 100644
--- a/src/GxInterface_PCC_3GPP_TS29212_9b0.ddf
+++ b/src/GxInterface_PCC_3GPP_TS29212_9b0.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               GxInterface_PCC_3GPP_TS29212_9b0.ddf
 //  Description:        DDF for Gx according to 3GPP TS 29.212 V9.11.0
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/GxInterface_PCC_3GPP_TS29212_aa0.ddf b/src/GxInterface_PCC_3GPP_TS29212_aa0.ddf
index 4bd9d970998d8767fa33a2fae49234ba0fcc1218..573aa01998b8691ccf745048e714626c93475369 100644
--- a/src/GxInterface_PCC_3GPP_TS29212_aa0.ddf
+++ b/src/GxInterface_PCC_3GPP_TS29212_aa0.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               GxInterface_PCC_3GPP_TS29212_aa0.ddf
 //  Description:        DDF for Gx according to 3GPP TS 29.212 V10.10.0
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/GxInterface_PCC_3GPP_TS29212_c52.ddf b/src/GxInterface_PCC_3GPP_TS29212_c52.ddf
index 6153ef703510b1c5c772424b1cd8d40bd7cc9685..aaa05329f1040eac92ebb543028cfce8aedefc19 100644
--- a/src/GxInterface_PCC_3GPP_TS29212_c52.ddf
+++ b/src/GxInterface_PCC_3GPP_TS29212_c52.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               GxInterface_PCC_3GPP_TS29212_c52.ddf
 //  Description:        DDF for Gx according to 3GPP TS 29.212 V12.5.2
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/GxaInterface_3GPP2_X_S0057_0_300.ddf b/src/GxaInterface_3GPP2_X_S0057_0_300.ddf
index 06b23ab6736a00134626e96f28c6d7904f0f7eab..434d070c40e180d47c8b006f7d3253cccd03453d 100644
--- a/src/GxaInterface_3GPP2_X_S0057_0_300.ddf
+++ b/src/GxaInterface_3GPP2_X_S0057_0_300.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               GxaInterface_3GPP2_X_S0057_0_300.ddf
 //  Description:        DDF for Gxa according to 3GPP2 X.S0057-0 v3.0
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/MobileIPv4_Application_IETF_RFC4004.ddf b/src/MobileIPv4_Application_IETF_RFC4004.ddf
index ce8792735e166262afa1075f67909e5c77e8436a..38c778b1bff75d95ffeb7cf27a8ee298d1d22a7d 100644
--- a/src/MobileIPv4_Application_IETF_RFC4004.ddf
+++ b/src/MobileIPv4_Application_IETF_RFC4004.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               MobileIPv4_Application_IETF_RFC4004.ddf
 //  Description:        DDF for Mobile IPv4 Application
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 //  Reference:          IETF RFC 4004
 //
diff --git a/src/MobileIPv6_HAAA_IETF_RFC5779.ddf b/src/MobileIPv6_HAAA_IETF_RFC5779.ddf
index d14bab217d38371410571f7cf80f6a17b4c69f59..e32352100a6fa21d09cf438060c324e402e382a8 100644
--- a/src/MobileIPv6_HAAA_IETF_RFC5779.ddf
+++ b/src/MobileIPv6_HAAA_IETF_RFC5779.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               MobileIPv6_HAAA_IETF_RFC5779.ddf
 //  Description:        DDF for Mobile IPv6 according to RFC 5779
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL113462
 ///////////////////////////////////////////////
 
diff --git a/src/MobileIPv6_HA_IETF_RFC5778.ddf b/src/MobileIPv6_HA_IETF_RFC5778.ddf
index b6c39f8c10f42a4428b59e0f2cdf87cdceffc5e7..be316d64c8bf59ea74d3e9a521d4849c486c34b8 100644
--- a/src/MobileIPv6_HA_IETF_RFC5778.ddf
+++ b/src/MobileIPv6_HA_IETF_RFC5778.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               MobileIPv6_HA_IETF_RFC5778.ddf
 //  Description:        DDF for Mobile IPv6 according to RFC 5778
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL113462
 ///////////////////////////////////////////////
 
diff --git a/src/MobileIPv6_NAS_IETF_RFC5447.ddf b/src/MobileIPv6_NAS_IETF_RFC5447.ddf
index 0caf089b8e60e88b6257a48f3ac2001d11e844f6..924002c0206d93aa569084cfa985de8016b5a71a 100644
--- a/src/MobileIPv6_NAS_IETF_RFC5447.ddf
+++ b/src/MobileIPv6_NAS_IETF_RFC5447.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               MobileIPv6_NAS_IETF_RFC5447.ddf
 //  Description:        DDF for Mobile IPv6 according to RFC 5447
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL113462
 ///////////////////////////////////////////////
 
diff --git a/src/NGN_NetworkAccesses_ETSI_ES183020_111.ddf b/src/NGN_NetworkAccesses_ETSI_ES183020_111.ddf
index 1f848e6bf6ab18f9a8d1578ebe02979fb98f2737..f82e619c346f23ba0c71df373f188bede175342f 100644
--- a/src/NGN_NetworkAccesses_ETSI_ES183020_111.ddf
+++ b/src/NGN_NetworkAccesses_ETSI_ES183020_111.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               NGN_NetworkAccesses_ETSI_ES183020_111.ddf
 //  Description:        DDF for NGN Network Accesses according to ETSI ES 183 020 V1.1.1
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/NetworkAccessServer_IETF_RFC4005.ddf b/src/NetworkAccessServer_IETF_RFC4005.ddf
index c3a732422e1d22369fcbe37d7c4923346b6f228e..970a3e0ca354024bc48175c9c55aacdac2c17a22 100644
--- a/src/NetworkAccessServer_IETF_RFC4005.ddf
+++ b/src/NetworkAccessServer_IETF_RFC4005.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               NetworkAccessServer_IETF_RFC4005.ddf
 //  Description:        DDF for NAS according to RFC 4005
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL113462
 ///////////////////////////////////////////////
 
diff --git a/src/README b/src/README
deleted file mode 100644
index 65e39504e0cab0e9359a2279136d3a2003f3f73b..0000000000000000000000000000000000000000
--- a/src/README
+++ /dev/null
@@ -1,11 +0,0 @@
-Warning to TCC DPMG ddf developers!
-
-If you're requested to add new AVPs or ddf files, you MUST make 
-the change in the main src/ directory and also in the obsolete/ 
-directory as well in order to maintain temporary backward compatibility.
-
-This is needed because the Application Names differ in the ddf files and 
-so AVP names and constants will differ also in the generated ttcn file.
-
-- 2010.06.29 note by ethecs: this README is updated. The obsolate
-  directory does not need to be updated according to ethgasz.
diff --git a/src/RqInterface_ETSI_ES283026_241.ddf b/src/RqInterface_ETSI_ES283026_241.ddf
index f218f2a681567fb286c4ecdc7e99931f22abafd4..86a144e9a0de016287ad4247447e72be6e12ab8f 100644
--- a/src/RqInterface_ETSI_ES283026_241.ddf
+++ b/src/RqInterface_ETSI_ES283026_241.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               RqInterface_ETSI_ES283026_241.ddf
 //  Description:        DDF for Rq according to ETSI ES 283 026 V2.4.1
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 // AVP implementations according to:
diff --git a/src/RxInterface_PCC_3GPP_TS29214_830.ddf b/src/RxInterface_PCC_3GPP_TS29214_830.ddf
index e379ecbf4f38359789839cac49fadcd34a7caed7..7c2471a66eeb6ca85a615a795fc59ba651e5a899 100644
--- a/src/RxInterface_PCC_3GPP_TS29214_830.ddf
+++ b/src/RxInterface_PCC_3GPP_TS29214_830.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               RxInterface_PCC_3GPP_TS29214_830.ddf
 //  Description:        DDF for Rx according to 3GPP TS 29.214 V8.3.0
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/RxInterface_PCC_3GPP_TS29214_8a0.ddf b/src/RxInterface_PCC_3GPP_TS29214_8a0.ddf
index f94f4f782c4b2d09afeea3d7bd14b252f44b6d44..28ea818efb52723df6645ae684511ec21ac80c82 100644
--- a/src/RxInterface_PCC_3GPP_TS29214_8a0.ddf
+++ b/src/RxInterface_PCC_3GPP_TS29214_8a0.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               RxInterface_PCC_3GPP_TS29214_830.ddf
 //  Description:        DDF for Rx according to 3GPP TS 29.214 V8.10.0
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/RxInterface_PCC_3GPP_TS29214_990.ddf b/src/RxInterface_PCC_3GPP_TS29214_990.ddf
index 887a78d58235b94b1a7c87a7d19ba44f6ce66328..79b44c60bced7ad64a675ca83eee1ebddaaf8cbc 100644
--- a/src/RxInterface_PCC_3GPP_TS29214_990.ddf
+++ b/src/RxInterface_PCC_3GPP_TS29214_990.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               RxInterface_PCC_3GPP_TS29214_990.ddf
 //  Description:        DDF for Rx according to 3GPP TS 29.214 V9.9.0
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/RxInterface_PCC_3GPP_TS29214_a70.ddf b/src/RxInterface_PCC_3GPP_TS29214_a70.ddf
index cbdb7b37f9c861b328c27885b7cd651ca0c7c6b6..f37653a60f25e91efa3b01089b6a843101bfbb24 100644
--- a/src/RxInterface_PCC_3GPP_TS29214_a70.ddf
+++ b/src/RxInterface_PCC_3GPP_TS29214_a70.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               RxInterface_PCC_3GPP_TS29214_a70.ddf
 //  Description:        DDF for Rx according to 3GPP TS 29.214 a.7.0
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/RxInterface_PCC_3GPP_TS29214_c10.ddf b/src/RxInterface_PCC_3GPP_TS29214_c10.ddf
index 3f1ddab22dff08d60a9e0f83926e4b7aab016299..0a7df4fa2b1a61bf50c8923158a664d0c6f2d9b4 100644
--- a/src/RxInterface_PCC_3GPP_TS29214_c10.ddf
+++ b/src/RxInterface_PCC_3GPP_TS29214_c10.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               RxInterface_PCC_3GPP_TS29214_c10.ddf
 //  Description:        DDF for Rx according to 3GPP TS 29.214 c.1.0
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/RxInterface_PCC_3GPP_TS29214_d10.ddf b/src/RxInterface_PCC_3GPP_TS29214_d10.ddf
new file mode 100644
index 0000000000000000000000000000000000000000..411cd12d2d4f40078ebffe308bab410a1702b51e
--- /dev/null
+++ b/src/RxInterface_PCC_3GPP_TS29214_d10.ddf
@@ -0,0 +1,325 @@
+/******************************************************************************
+* Copyright (c) 2004, 2015  Ericsson AB
+* All rights reserved. This program and the accompanying materials
+* are made available under the terms of the Eclipse Public License v1.0
+* which accompanies this distribution, and is available at
+* http://www.eclipse.org/legal/epl-v10.html
+*
+* Contributors:
+*   Gabor Szalai - initial implementation
+******************************************************************************/
+//
+//  File:               RxInterface_PCC_3GPP_TS29214_d10.ddf
+//  Description:        DDF for Rx according to 3GPP TS 29.214 d.1.0
+//  Rev:                R34A
+//  Prodnr:             CNL 113 462
+///////////////////////////////////////////////
+
+
+// APPLICATION-NAME: RX
+// APPLICATION-REVISION: VD_1_0
+
+// AVP implementations according to: 
+// 3GPP TS 29.214 13.1.0 - Policy and Charging Control over Rx reference point
+//
+//
+// Dependant applications
+// 3GPP TS 29.229  - Cx and Dx interfaces based on the Diameter protocol
+// TS 183.017      - DIAMETER protocol for session based policy set-up information exchange between
+//                   the Application Function (AF) and the Service Policy Decision Function (SPDF)
+// IETF RFC 3588   - Diameter Base Protocol
+// IETF RFC 4005   - Diameter Network Address Server
+// IETF RFC 4006   - Diameter Credit Control Application
+//
+// Notes: 
+// Present application has its own vendor specific Diameter application id: 16777236
+//
+// Type of enumerated AVP Media-Type is changed to AVP_Unsigned32 to
+// give the ability to contain OTHER (0xFFFFFFFF) value
+//
+
+// 3GPP TS 29.214 d.1.0 5.6
+type enumerated Command_Code
+{
+  Authorize_Authenticate (265),
+  Re_Auth                (258),
+  Session_Termination    (275),
+  Abort_Session          (274)
+}
+
+
+
+// 3GPP TS 29.214 d.1.0
+// AVP: Abort-Cause (500) 3GPP (10415)
+// 5.3.1
+type enumerated Abort_Cause
+{
+  BEARER_RELEASED               (0),
+  INSUFFICIENT_SERVER_RESOURCES (1),
+  INSUFFICIENT_BEARER_RESOURCES (2),
+  PS_TO_CS_HANDOVER             (3),
+  SPONSORED_DATA_CONNECTIVITY_DISALLOWED (4)
+}
+
+
+// 3GPP TS 29.214 d.1.0
+// AVP: Access-Network-Charging-Address (501) 3GPP (10415)
+// 5.3.2
+type AVP_Address Access_Network_Charging_Address;
+
+
+// 3GPP TS 29.214 d.1.0
+// AVP: Access-Network-Charging-Identifier (502) 3GPP (10415)
+// 5.3.3
+type AVP_Grouped Access_Network_Charging_Identifier;
+
+
+// 3GPP TS 29.214 d.1.0
+// AVP: Access-Network-Charging-Identifier-Value (503) 3GPP (10415)
+// 5.3.4
+type AVP_OctetString Access_Network_Charging_Identifier_Value;
+
+
+
+
+// 3GPP TS 29.214 d.1.0
+// AVP: AF-Application-Identifier (504) 3GPP (10415)
+// 5.3.5
+type AVP_OctetString AF_Application_Identifier;
+
+
+// 3GPP TS 29.214 d.1.0
+// AVP: AF-Charging-Identifier (505) 3GPP (10415)
+// 5.3.6
+type AVP_OctetString AF_Charging_Identifier;
+
+
+// 3GPP TS 29.214 d.1.0
+// AVP: Codec-Data  (524) 3GPP (10415)
+// 5.3.7
+type AVP_OctetString Codec_Data;
+
+
+// 3GPP TS 29.214 d.1.0
+// AVP: Flow-Description (507) 3GPP (10415)
+// 5.3.8
+type AVP_IPFilterRule Flow_Description;
+
+
+// 3GPP TS 29.214 d.1.0
+// AVP: Flow-Number (509) 3GPP (10415)
+// 5.3.9
+type AVP_Unsigned32 Flow_Number;
+
+
+// 3GPP TS 29.214 d.1.0
+// AVP: Flows (510) 3GPP (10415)
+// 5.3.10
+type AVP_Grouped Flows;
+
+
+// 3GPP TS 29.214 d.1.0
+// AVP: Flow-Status (511) 3GPP (10415)
+// 5.3.11
+type enumerated Flow_Status
+{
+  ENABLED_UPLINK      (0),
+  ENABLED_DOWNLINK    (1),
+  ENABLED             (2),
+  DISABLED            (3),
+  REMOVED             (4)
+}
+
+
+// 3GPP TS 29.214 d.1.0
+// AVP: Flow-Usage (512) 3GPP (10415)
+// 5.3.12
+type enumerated Flow_Usage
+{
+  NO_INFORMATION      (0),
+  RTCP                (1),
+  AF_SIGNALLING       (2)
+}
+
+
+// 3GPP TS 29.214 d.1.0
+// AVP: Specific-Action (513) 3GPP (10415)
+// 5.3.13
+type enumerated Specific_Action
+{
+  CHARGING_CORRELATION_EXCHANGE         (1),
+  INDICATION_OF_LOSS_OF_BEARER          (2),
+  INDICATION_OF_RECOVERY_OF_BEARER      (3),
+  INDICATION_OF_RELEASE_OF_BEARER       (4),
+  INDICATION_OF_ESTABLISHMENT_OF_BEARER (5),
+  IP_CAN_CHANGE                         (6),
+  INDICATION_OF_OUT_OF_CREDIT           (7),
+  INDICATION_OF_SUCCESSFUL_RESOURCES_ALLOCATION (8),
+  INDICATION_OF_FAILED_RESOURCES_ALLOCATION (9),
+  INDICATION_OF_LIMITED_PCC_DEPLOYMENT (10),
+  USAGE_REPORT                         (11),
+  ACCESS_NETWORK_INFO_REPORT           (12),
+  INDICATION_OF_RECOVERY_FROM_LIMITED_PCC_DEPLOYMENT (13),
+  INDICATION_OF_ACCESS_NETWORK_INFO_REPORTING_FAILURE (14)
+}
+
+
+// 3GPP TS 29.214 d.1.0
+// AVP: Max-Requested-Bandwidth-DL (515) 3GPP (10415)
+// 5.3.14
+type AVP_Unsigned32 Max_Requested_Bandwidth_DL;
+
+
+// 3GPP TS 29.214 d.1.0
+// AVP: Max-Requested-Bandwidth-UL (516) 3GPP (10415)
+// 5.3.15
+type AVP_Unsigned32 Max_Requested_Bandwidth_UL;
+
+
+// 3GPP TS 29.214 d.1.0
+// AVP: Media-Component-Description (517) 3GPP (10415)
+// 5.3.16
+type AVP_Grouped Media_Component_Description;
+
+
+// 3GPP TS 29.214 d.1.0
+// AVP: Media-Component-Number (518) 3GPP (10415)
+// 5.3.17
+type AVP_Unsigned32 Media_Component_Number;
+
+
+// 3GPP TS 29.214 d.1.0
+// AVP: Media-Sub-Component (519) 3GPP (10415)
+// 5.3.18
+type AVP_Grouped Media_Sub_Component;
+
+
+// 3GPP TS 29.214 d.1.0
+// AVP: Media-Type (520) 3GPP (10415)
+// 5.3.19
+type AVP_Unsigned32 Media_Type;
+
+
+// 3GPP TS 29.214 d.1.0
+// AVP: RR-Bandwidth (521) 3GPP (10415)
+// 5.3.20
+type AVP_Unsigned32 RR_Bandwidth;
+
+
+// 3GPP TS 29.214 d.1.0
+// AVP: RS-Bandwidth (522) 3GPP (10415)
+// 5.3.21
+type AVP_Unsigned32 RS_Bandwidth;
+
+// 3GPP TS 29.214 d.1.0
+// AVP: SIP-Forking-Indication (523) 3GPP (10415)
+// 5.3.22
+type enumerated SIP_Forking_Indication
+{
+   SINGLE_DIALOGUE   (0),
+   SEVERAL_DIALOGUES (1) 
+}
+
+// 3GPP TS 29.214 d.1.0
+// AVP:  Service-URN (525) 3GPP (10415)
+// 5.3.23
+type AVP_OctetString Service_URN;
+
+
+// 3GPP TS 29.214 d.1.0
+// AVP: Acceptable-Service-Info (526) 3GPP (10415)
+// 5.3.24
+type AVP_Grouped Acceptable_Service_Info;
+
+// 3GPP TS 29.214 d.1.0
+// AVP: Service-Info-Status (527) 3GPP (10415)
+// 5.3.25
+type enumerated Service_Info_Status 
+{
+  FINAL_SERVICE_INFORMATION       (0),	
+  PRELIMINARY_SERVICE_INFORMATION (1)
+}
+
+// 3GPP TS 29.214 d.1.0
+// AVP: AF-Signalling-Protocol (529) 3GPP (10415)
+// 5.3.26
+type enumerated AF_Signalling_Protocol 
+{
+  NO_INFORMATION      (0),	
+  SIP (1)
+}
+
+// 3GPP TS 29.214 d.1.0
+// AVP: Sponsored-Connectivity-Data (530) 3GPP (10415)
+// 5.3.27
+type AVP_Grouped Sponsored_Connectivity_Data;
+
+// 3GPP TS 29.214 d.1.0
+// AVP: Sponsor-Identity (531) 3GPP (10415)
+// 5.3.28
+type AVP_UTF8String Sponsor_Identity;
+
+// 3GPP TS 29.214 d.1.0
+// AVP: Application-Service-Provider-Identity (532) 3GPP (10415)
+// 5.3.29
+type AVP_UTF8String Application_Service_Provider_Identity;
+
+
+// 3GPP TS 29.214 d.1.0
+// AVP: MPS-Identifier (528) 3GPP (10415)
+// 5.3.30
+type AVP_OctetString MPS_Identifier;
+
+// 3GPP TS 29.214 d.1.0
+// AVP: Rx-Request-Type (533) 3GPP (10415)
+// 5.3.31
+type enumerated Rx_Request_Type 
+{
+  INITIAL_REQUEST      (0),	
+  UPDATE_REQUEST (1),
+  PCSCF_RESTORATION (2)
+}
+
+// 3GPP TS 29.214 d.1.0
+// AVP: Min-Requested-Bandwidth-DL (534) 3GPP (10415)
+// 5.3.32
+type AVP_Unsigned32 Min_Requested_Bandwidth_DL;
+
+// 3GPP TS 29.214 d.1.0
+// AVP: Min-Requested-Bandwidth-UL (535) 3GPP (10415)
+// 5.3.33
+type AVP_Unsigned32 Min_Requested_Bandwidth_UL;
+
+// 3GPP TS 29.214 d.1.0
+// AVP: Required-Access-Info (536) 3GPP (10415)
+// 5.3.34
+type enumerated Required_Access_Info 
+{
+  USER_LOCATION      (0),	
+  MS_TIME_ZONE (1)
+}
+
+// 3GPP TS 29.214 d.1.0
+// AVP: Ip-Domain-Id (537) 3GPP (10415)
+// 5.3.35
+type AVP_OctetString Ip_Domain_Id;
+
+// 3GPP TS 29.214 d.1.0
+// AVP: GCS-Identifier (538) 3GPP (10415)
+// 5.3.36
+type AVP_OctetString GCS_Identifier;
+
+// 3GPP TS 29.214 d.1.0
+// AVP: Sharing-Key-DL (539) 3GPP (10415)
+// 5.3.37
+type AVP_Unsigned32 Sharing_Key_DL;
+
+// 3GPP TS 29.214 d.1.0
+// AVP: Sharing-Key-UL  (540) 3GPP (10415)
+// 5.3.38
+type AVP_Unsigned32 Sharing_Key_UL;
+
+// 3GPP TS 29.214 d.1.0
+// AVP: Retry-Interval (541) 3GPP (10415)
+// 5.3.39
+type AVP_Unsigned32 Retry_Interval;
diff --git a/src/S9Interface_3GPP_TS29215_b40.ddf b/src/S9Interface_3GPP_TS29215_b40.ddf
index 2055e0f482c6c608784b0e983530d9015d92fbf8..23d124f6fdf04b14a400aad004c6f094c2492cb7 100644
--- a/src/S9Interface_3GPP_TS29215_b40.ddf
+++ b/src/S9Interface_3GPP_TS29215_b40.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               S9Interface_3GPP_TS29215_b40.ddf
 //  Description:        DDF for S9 according to 3GPP TS 29.215 V11.4.0
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/SGmbInterface_3GPP_TS29061_940.ddf b/src/SGmbInterface_3GPP_TS29061_940.ddf
index 161de288f1eafdf1af9e644a94718d389ec19d0e..36eb760fda190200376824b02676f5bf7f0ad7e4 100644
--- a/src/SGmbInterface_3GPP_TS29061_940.ddf
+++ b/src/SGmbInterface_3GPP_TS29061_940.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               SGmbInterface_3GPP_TS29061_940.ddf
 //  Description:        DDF for SGmb according to 3GPP TS 29.061 V9.4.0
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/SGmbInterface_3GPP_TS29061_980.ddf b/src/SGmbInterface_3GPP_TS29061_980.ddf
index af4a953db250c3ab1c4b53e82113d41d9afcaf7d..6297f0a1031c82ded533b01feb9ca709d45ca593 100644
--- a/src/SGmbInterface_3GPP_TS29061_980.ddf
+++ b/src/SGmbInterface_3GPP_TS29061_980.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               SGmbInterface_3GPP_TS29061_980.ddf
 //  Description:        DDF for SGmb according to 3GPP TS 29.061 V9.8.0
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/SGmbInterface_3GPP_TS29061_b90.ddf b/src/SGmbInterface_3GPP_TS29061_b90.ddf
new file mode 100644
index 0000000000000000000000000000000000000000..302ef43e7f1f0a8ee6d00137f47d200425a2211f
--- /dev/null
+++ b/src/SGmbInterface_3GPP_TS29061_b90.ddf
@@ -0,0 +1,71 @@
+/******************************************************************************
+* Copyright (c) 2004, 2015  Ericsson AB
+* All rights reserved. This program and the accompanying materials
+* are made available under the terms of the Eclipse Public License v1.0
+* which accompanies this distribution, and is available at
+* http://www.eclipse.org/legal/epl-v10.html
+*
+* Contributors:
+*   Timea Moder
+******************************************************************************/
+//
+//  File:               SGmbInterface_3GPP_TS29061_b90.ddf
+//  Description:        DDF for SGmb according to 3GPP TS 29.061 V11.9.0
+//  Rev:                R34A
+//  Prodnr:             CNL 113 462
+///////////////////////////////////////////////
+
+
+// APPLICATION-NAME: SGMB
+// APPLICATION-REVISION: V11_9_0
+
+// AVP implementations according to: 
+// 3GPP TS 29.061 V11.9.0 - Interworking between the Public Land Mobile Network (PLMN) supporting packet based services and Packet Data Networks (PDN)
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: MBMS-Access-Indicator (923) 3GPP (10415)
+// 20.5a.1
+type enumerated MBMS_Access_Indicator
+{
+  UTRAN                 (0),
+  E_UTRAN               (1),
+  UTRAN_AND_E_UTRAN     (2)
+}
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: MBMS-GW-SSM-IP-Address (924) 3GPP (10415)
+// 20.5a.2
+type AVP_OctetString MBMS_GW_SSM_IP_Address;
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: MBMS-GW-SSM-IPv6-Address (925) 3GPP (10415)
+// 20.5a.3
+type AVP_OctetString MBMS_GW_SSM_IPv6_Address;
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: MBMS-BMSC-SSM-UDP-Port (926) 3GPP (10415)
+// 20.5a.4
+type AVP_OctetString MBMS_BMSC_SSM_UDP_Port;
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: MBMS-GW-UDP-Port (927) 3GPP (10415)
+// 20.5a.5
+type AVP_OctetString MBMS_GW_UDP_Port;
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: MBMS-GW-UDP-Port-Indicator (928) 3GPP (10415) 
+// 20.5a.6
+type enumerated MBMS_GW_UDP_Port_Indicator
+{
+  UDP_PORT_REQUIRED (1)
+}
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: MBMS-Data-Transfer-Start (929) 3GPP (10415)
+// 20.5a.7
+type AVP_Unsigned64 MBMS_Data_Transfer_Start;
+
+// 3GPP TS 29.061 V11.9.0
+// AVP: MBMS-Data-Transfer-Stop (930) 3GPP (10415)
+// 20.5a.8
+type AVP_Unsigned64 MBMS_Data_Transfer_Stop;
diff --git a/src/ShInterface_3GPP_TS29329_620.ddf b/src/ShInterface_3GPP_TS29329_620.ddf
index 3a5a0ef8aab8c3d2b49f9941c35f94db1c3dc9a9..c9484c2f1ff6b94bdbdf4bb83799e5fc42718c47 100644
--- a/src/ShInterface_3GPP_TS29329_620.ddf
+++ b/src/ShInterface_3GPP_TS29329_620.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               ShInterface_3GPP_TS29329_620.ddf
 //  Description:        DDF for Sh Interface according to 3GPP 29.329 v6.2.0
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/ShInterface_3GPP_TS29329_750.ddf b/src/ShInterface_3GPP_TS29329_750.ddf
index 5fb22d0ec6ec7ccbb5c57ca57d9cde6f0c91b66f..d327c1413dddee923ba7cd612cbff0955b244efc 100644
--- a/src/ShInterface_3GPP_TS29329_750.ddf
+++ b/src/ShInterface_3GPP_TS29329_750.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               ShInterface_3GPP_TS29329_750.ddf
 //  Description:        DDF for Sh Interface according to 3GPP 29.329 v7.5.0
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/ShInterface_3GPP_TS29329_820.ddf b/src/ShInterface_3GPP_TS29329_820.ddf
index 71c0c5764430a28ca9af230411e5da7e0fe2f83c..a484a5b2b882893b07e9c9b5ef987bb32cb0267c 100644
--- a/src/ShInterface_3GPP_TS29329_820.ddf
+++ b/src/ShInterface_3GPP_TS29329_820.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               ShInterface_3GPP_TS29329_820.ddf
 //  Description:        DDF for Sh Interface according to 3GPP 29.329 v8.2.0
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/ShInterface_3GPP_TS29329_a30.ddf b/src/ShInterface_3GPP_TS29329_a30.ddf
index d4433336f8357a27f48161260be3ca851bb97e6b..61d5bc8d93e7eb45f5affbf09543e77386a75808 100644
--- a/src/ShInterface_3GPP_TS29329_a30.ddf
+++ b/src/ShInterface_3GPP_TS29329_a30.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               ShInterface_3GPP_TS29329_a30.ddf
 //  Description:        DDF for Sh Interface according to 3GPP 29.329 v10.3.0
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/ShInterface_3GPP_TS29329_a50.ddf b/src/ShInterface_3GPP_TS29329_a50.ddf
index 6544addbd0233383e09d2410142aced08510b925..c0e2264645436a04de76c7846f9dc105347b2d14 100644
--- a/src/ShInterface_3GPP_TS29329_a50.ddf
+++ b/src/ShInterface_3GPP_TS29329_a50.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               ShInterface_3GPP_TS29329_a50.ddf
 //  Description:        DDF for Sh Interface according to 3GPP 29.329 v10.5.0
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/SyInterface_3GPP_TS29219_b30.ddf b/src/SyInterface_3GPP_TS29219_b30.ddf
index 79fb6655286df0103a6503bfb3e0fd31cc3ffeca..c2ebb58ce32dd1121bbcc6e1555be858bbaba0e0 100644
--- a/src/SyInterface_3GPP_TS29219_b30.ddf
+++ b/src/SyInterface_3GPP_TS29219_b30.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               SyInterface_3GPP_TS29219_b30.ddf
 //  Description:        DDF for Sy Interface according to 3GPP 29.219 v11.3.0
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/TCOM_Specific_AVPs.ddf b/src/TCOM_Specific_AVPs.ddf
index 651fe58e6401fb25d21e3b9428cf7c50e381c470..7cad6c898480d15903c71960e04e5cf885a21e2f 100644
--- a/src/TCOM_Specific_AVPs.ddf
+++ b/src/TCOM_Specific_AVPs.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               TCOM_Specific_AVPs.ddf
 //  Description:        T-COM specific AVP definitions
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/Verizon_Specific_AVPs.ddf b/src/Verizon_Specific_AVPs.ddf
index 9fd1b0e334a11611490e3163cb43907fecaa4028..bfa278c54c1ec3a7f898f0e2ede5b26a0d765d90 100644
--- a/src/Verizon_Specific_AVPs.ddf
+++ b/src/Verizon_Specific_AVPs.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               Verizon_Specific_AVPs.ddf
 //  Description:        Verizon specific AVP definitions
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/Vimpelcom_Specific.ddf b/src/Vimpelcom_Specific.ddf
index b6132657069c35f12f4eee237300ea3a66dc368c..2c6a1dfebbbf155394d646031e9a1f41bb4d11db 100644
--- a/src/Vimpelcom_Specific.ddf
+++ b/src/Vimpelcom_Specific.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               Vimpelcom_Specific.ddf
 //  Description:        Vimpelcom specific AVPs
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/Vodafone_Specific.ddf b/src/Vodafone_Specific.ddf
index c567d9f7460f7ddf67f4debd82ffcff08394700d..a3025b60bd0d33446d5bf169aedeb777442a2e15 100644
--- a/src/Vodafone_Specific.ddf
+++ b/src/Vodafone_Specific.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               Vodafone_Specific.ddf
 //  Description:        Vodafone specific AVPs
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/WgInterface_3GPP_TS29234_910.ddf b/src/WgInterface_3GPP_TS29234_910.ddf
index ec66e201504806d1d8e0c81fcf90622fd483276d..408122050cdcb80a1948170288e8b80c6d0d3a14 100644
--- a/src/WgInterface_3GPP_TS29234_910.ddf
+++ b/src/WgInterface_3GPP_TS29234_910.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               WgInterface_3GPP_TS29234_910.ddf
 //  Description:        DDF for 3GPP to WLAN interworking according to 3GPP TS 29.234 V9.1.0
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/a2Interface_ETSI_ES183059_1_211.ddf b/src/a2Interface_ETSI_ES183059_1_211.ddf
index d81f0a5caff45ad17a92391837a18f931aaabc76..fb9a30a504e5876ca5bc124032c4957009c42209 100644
--- a/src/a2Interface_ETSI_ES183059_1_211.ddf
+++ b/src/a2Interface_ETSI_ES183059_1_211.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               a2Interface_ETSI_ES183059_1_211.ddf
 //  Description:        DDF for a2 Interface according to ETSI ES 183 059-1 V2.1.1
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/a4Interface_ETSI_ES183066_211.ddf b/src/a4Interface_ETSI_ES183066_211.ddf
index 8c0f658415ab20225449079d6ae7f2267e09d1cd..994d336857d4969abe077953386b57d1f0eec4a2 100644
--- a/src/a4Interface_ETSI_ES183066_211.ddf
+++ b/src/a4Interface_ETSI_ES183066_211.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               a4Interface_ETSI_ES183066_211.ddf
 //  Description:        DDF for a4 Interface according to ETSI ES 183 066 V2.1.1
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/e2Interface_ETSI_ES283035_121.ddf b/src/e2Interface_ETSI_ES283035_121.ddf
index d6abc9e82874e1849cac57745c0968ed01971e67..ecd82a5918b63f3c14afe8e47314a52ce27a651d 100644
--- a/src/e2Interface_ETSI_ES283035_121.ddf
+++ b/src/e2Interface_ETSI_ES283035_121.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               e2Interface_ETSI_ES283035_121.ddf
 //  Description:        DDF for e2 Interface according to ETSI ES 283 035 V1.2.1
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/e4Interface_ETSI_ES283034_220.ddf b/src/e4Interface_ETSI_ES283034_220.ddf
index f8038381fb113bc3e521b62794d32a6b709afd30..403ed6bc48e102b14e67c93adb53e2fa4136505b 100644
--- a/src/e4Interface_ETSI_ES283034_220.ddf
+++ b/src/e4Interface_ETSI_ES283034_220.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               e4Interface_ETSI_ES283034_220.ddf
 //  Description:        DDF for e4 Interface according to ETSI ES 283 034 V2.2.0
-//  Rev:                R29A
+//  Rev:                R34A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////