diff --git a/demo/DIAMETER_Types.ttcn b/demo/DIAMETER_Types.ttcn
index 571e45d7aa98caa134dd13710f9e9a348266d21b..66f83d24b3aef4ec176aaa1aa52eb7fdf8a39570 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
@@ -273,7 +273,7 @@ command_code, application_id, hop_by_hop_id, end_to_end_id, avps)";
 //
 //  File:               Base_IETF_RFC3588.ddf
 //  Description:	DDF for the Diameter base AVPs
-//  Rev:                <RnXnn>
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
@@ -666,7 +666,7 @@ type AVP_Grouped BASE_NONE_Vendor_Specific_Application_Id
 //
 //  File:               Ericsson_Specific_AVPs.ddf
 //  Description:        Ericsson specific AVP definitions
-//  Rev:                <RnXnn>
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 //  Reference:          http://snmp.ericsson.se/diameter-assignments.html
 //
diff --git a/doc/DIAMETER_ProtocolModule_Generator_CNL113462_1551.doc b/doc/DIAMETER_ProtocolModule_Generator_CNL113462_1551.doc
index f7f7e5f3ac337619eec6e20b6a1c8d0f6a4bdc23..00d0beab04100e566f14144ad895a4e59aa26b20 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 c68861af6d3aebdec82dc3d44529b08da84ea95e..7ae08b098f39fdfff65b9c01265e422ad7f1aa7f 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 c7f0a6935e5b885ddd624de1dc2b7918855d6714..8accb6028918e472c72b09e534d87ededae72bd6 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/AAAInterface_3GPP_TS29272_950.ddf b/src/AAAInterface_3GPP_TS29272_950.ddf
index 2f6bb0773b9db35a3c3c124d5f8def8ae4823d85..584b858041572ec917ec2da191ab6d4d68b8ac02 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 
 
diff --git a/src/AAAInterface_3GPP_TS29272_970.ddf b/src/AAAInterface_3GPP_TS29272_970.ddf
index 2b97450446c3a4b6c427b413d02cbaa408e8c01a..e35c46f6350bf5ccf2ec3b081e47994de363288c 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 
 
diff --git a/src/AAAInterface_3GPP_TS29272_a30.ddf b/src/AAAInterface_3GPP_TS29272_a30.ddf
index 0f71f853f05ff3e53b752859ee4d434c540b03ae..f6693dfbc80b8d5abfd8ffa7d2215a9af287afc1 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 
 
diff --git a/src/AAAInterface_3GPP_TS29272_a60.ddf b/src/AAAInterface_3GPP_TS29272_a60.ddf
index 90d61d04826ea87512f2f230c4e526111c5d369f..6ff3e0cbea75e0241731ff494c402779de782bb4 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 
 
diff --git a/src/AAAInterface_3GPP_TS29272_b60.ddf b/src/AAAInterface_3GPP_TS29272_b60.ddf
index b4b0dffc7df8d395712b96d581904fce1864561a..a6ee726350c4a3f30d2e43d2fc217771838779a0 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 
 
diff --git a/src/AAAInterface_3GPP_TS29272_bd0.ddf b/src/AAAInterface_3GPP_TS29272_bd0.ddf
index e928eecb85650f38ba17c7a9438729068db0a77e..90055642524202e10aa0c6347532aecf604fb336 100644
--- a/src/AAAInterface_3GPP_TS29272_bd0.ddf
+++ b/src/AAAInterface_3GPP_TS29272_bd0.ddf
@@ -11,7 +11,7 @@
 //
 //  File:               AAAInterface_3GPP_TS29272_bd0.ddf
 //  Description:        DDF for S6a/S6d and S13 Interfaces according to 3GPP TS 29.272 V11.13.0
-//  Rev:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 
 
diff --git a/src/AAAInterface_3GPP_TS29272_d70.ddf b/src/AAAInterface_3GPP_TS29272_d70.ddf
new file mode 100644
index 0000000000000000000000000000000000000000..b52e09908d629d0fb3429a056a78e44ddf7e8f76
--- /dev/null
+++ b/src/AAAInterface_3GPP_TS29272_d70.ddf
@@ -0,0 +1,1177 @@
+/******************************************************************************
+* 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
+*   Kalman Mikecz
+******************************************************************************/
+//
+//  File:               AAAInterface_3GPP_TS29272_d70.ddf
+//  Description:        DDF for S6a/S6d and S13 Interfaces according to 3GPP TS 29.272 V13.7.0
+//  Rev:                R55A
+//  Prodnr:             CNL 113 462
+
+
+// APPLICATION-NAME: AAA
+// APPLICATION-REVISION: V13_7_0
+
+// AVP implementations according to: 
+// 3GPP TS 29.272 V13.7.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 V13.7.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 V13.7.0
+// 7.3.2
+// AVP: Subscription-Data (1400) 3GPP (10415)
+type AVP_Grouped Subscription_Data;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.3
+// AVP: Terminal-Information (1401) 3GPP (10415)
+type AVP_Grouped Terminal_Information;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.4
+// AVP: IMEI (1402) 3GPP (10415)
+type AVP_UTF8String IMEI;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.5
+// AVP: Software-Version (1403) 3GPP (10415)
+type AVP_UTF8String Software_Version;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.77
+// AVP: QoS-Subscribed (1404) 3GPP (10415)
+type AVP_OctetString QoS_Subscribed;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.7
+// AVP: ULR-Flags (1405) 3GPP (10415)
+type AVP_Unsigned32 ULR_Flags;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.8
+// AVP: ULA-Flags (1406) 3GPP (10415)
+type AVP_Unsigned32 ULA_Flags;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.9
+// AVP: Visited-PLMN-Id (1407) 3GPP (10415) 
+type AVP_OctetString Visited_PLMN_Id;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.11
+// AVP: Requested-EUTRAN-Authentication-Info (1408) 3GPP (10415)
+type AVP_Grouped Requested_EUTRAN_Authentication_Info;
+
+// 3GPP TS 29.272 V13.7.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 V13.7.0
+// 7.3.14
+// AVP: Number-Of-Requested-Vectors (1410) 3GPP (10415)
+type AVP_Unsigned32 Number_Of_Requested_Vectors;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.15
+// AVP: Re-Synchronization-Info (1411) 3GPP (10415)
+type AVP_OctetString Re_Synchronization_Info;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.16
+// AVP: Immediate-Response-Preferred (1412) 3GPP (10415)
+type AVP_Unsigned32 Immediate_Response_Preferred;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.17
+// AVP: Authentication-Info (1413) 3GPP (10415)
+type AVP_Grouped Authentication_Info;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.18
+// AVP: E-UTRAN-Vector (1414) 3GPP (10415)
+type AVP_Grouped E_UTRAN_Vector;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.19
+// AVP: UTRAN-Vector (1415) 3GPP (10415)
+type AVP_Grouped UTRAN_Vector;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.20
+// AVP: GERAN-Vector (1416) 3GPP (10415)
+type AVP_Grouped GERAN_Vector;
+
+// 3GPP TS 29.272 V13.7.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 V13.7.0
+// 7.3.22
+// AVP: HPLMN-ODB (1418) 3GPP (10415)
+type AVP_Unsigned32 HPLMN_ODB;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.23
+// AVP: Item-Number (1419) 3GPP (10415)
+type AVP_Unsigned32 Item_Number;
+
+// 3GPP TS 29.272 V13.7.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 V13.7.0
+// 7.3.25
+// AVP: DSR-Flags (1421) 3GPP (10415)
+type AVP_Unsigned32 DSR_Flags;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.26
+// AVP: DSA-Flags (1422) 3GPP (10415)
+type AVP_Unsigned32 DSA_Flags;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.27
+// AVP: Context-Identifier (1423) 3GPP (10415)
+type AVP_Unsigned32 Context_Identifier;
+
+// 3GPP TS 29.272 V13.7.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 V13.7.0
+// 7.3.30
+// AVP: Operator-Determined-Barring (1425) 3GPP (10415)
+type AVP_Unsigned32 Operator_Determined_Barring;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.31
+// AVP: Access-Restriction-Data (1426) 3GPP (10415)
+type AVP_Unsigned32 Access_Restriction_Data;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.32
+// AVP: APN-OI-Replacement (1427) 3GPP (10415)
+type AVP_UTF8String APN_OI_Replacement;
+
+// 3GPP TS 29.272 V13.7.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 V13.7.0
+// 7.3.34
+// AVP: APN-Configuration-Profile (1429) 3GPP (10415)
+type AVP_Grouped APN_Configuration_Profile;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.35
+// AVP: APN-Configuration (1430) 3GPP (10415)
+type AVP_Grouped APN_Configuration;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.37
+// AVP: EPS-Subscribed-QoS-Profile (1431) 3GPP (10415)
+type AVP_Grouped EPS_Subscribed_QoS_Profile;
+
+// 3GPP TS 29.272 V13.7.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 V13.7.0
+// 7.3.39
+// AVP: STN-SR (1433) 3GPP (10415)
+type AVP_OctetString STN_SR;
+
+// 3GPP TS 29.272 V13.7.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 V13.7.0
+// 7.3.41
+// AVP: AMBR (1435) 3GPP (10415)
+type AVP_Grouped AMBR;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.78
+// AVP: CSG-Subscription-Data (1436) 3GPP (10415)
+type AVP_Grouped CSG_Subscription_Data;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.79
+// AVP: CSG-Id (1437) 3GPP (10415)
+type AVP_Unsigned32 CSG_Id;
+
+// 3GPP TS 29.272 V13.7.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 V13.7.0
+// 7.3.80
+// AVP: Expiration-Date (1439) 3GPP (10415)
+type AVP_Time Expiration_Date;
+
+// 3GPP TS 29.272 V13.7.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 V13.7.0
+// 7.3.47
+// AVP: IDA-Flags (1441) 3GPP (10415)
+type AVP_Unsigned32 IDA_Flags;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.48
+// AVP: PUA-Flags (1442) 3GPP (10415)
+type AVP_Unsigned32 PUA_Flags;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.49
+// AVP: NOR-Flags (1443) 3GPP (10415)
+type AVP_Unsigned32 NOR_Flags;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.50
+// AVP: User-Id (1444) 3GPP (10415)
+type AVP_UTF8String User_Id;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.51
+// AVP: Equipment-Status (1445) 3GPP (10415)
+type enumerated Equipment_Status
+{
+  WHITELISTED (0),
+  BLACKLISTED (1),
+  GREYLISTED  (2)
+}
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.52
+// AVP: Regional-Subscription-Zone-Code (1446) 3GPP (10415)
+type AVP_OctetString Regional_Subscription_Zone_Code;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.53
+// AVP: RAND (1447) 3GPP (10415)
+type AVP_OctetString RAND;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.54
+// AVP: XRES (1448) 3GPP (10415)
+type AVP_OctetString XRES;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.55
+// AVP: AUTN (1449) 3GPP (10415)
+type AVP_OctetString AUTN;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.56
+// AVP: KASME (1450) 3GPP (10415)
+type AVP_OctetString KASME;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.98
+// AVP: Trace-Collection-Entity (1452) 3GPP (10415)
+type AVP_Address Trace_Collection_Entity;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.59
+// AVP: Kc (1453) 3GPP (10415)
+type AVP_OctetString Kc;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.60
+// AVP: SRES (1454) 3GPP (10415)
+type AVP_OctetString SRES;
+
+// 3GPP TS 29.272 V13.7.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 V13.7.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 V13.7.0
+// 7.3.63
+// AVP: Trace-Data (1458) 3GPP (10415)
+type AVP_Grouped Trace_Data;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.64
+// AVP: Trace-Reference (1459) 3GPP (10415)
+type AVP_OctetString Trace_Reference;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.67
+// AVP: Trace-Depth (1462) 3GPP (10415)
+// FS 3.3.2.10
+type AVP_Unsigned32 Trace_Depth;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.68
+// AVP: Trace-NE-Type-List (1463) 3GPP (10415)
+type AVP_OctetString Trace_NE_Type_List;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.69
+// AVP: Trace-Interface-List (1464) 3GPP (10415)
+type AVP_OctetString Trace_Interface_List;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.70
+// AVP: Trace-Event-List (1465) 3GPP (10415)
+type AVP_OctetString Trace_Event_List;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.71
+// AVP: OMC-Id (1466) 3GPP (10415)
+type AVP_OctetString OMC_Id;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.72
+// AVP: GPRS-Subscription-Data (1467) 3GPP (10415)
+type AVP_Grouped GPRS_Subscription_Data;
+
+// 3GPP TS 29.272 V13.7.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 V13.7.0
+// 7.3.74
+// AVP: PDP-Context (1469) 3GPP (10415)
+type AVP_Grouped PDP_Context;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.75
+// AVP: PDP-Type (1470) 3GPP (10415)
+type AVP_OctetString PDP_Type;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.6
+// AVP: 3GPP2-MEID (1471) 3GPP (10415)
+type AVP_OctetString 3GPP2_MEID;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.82
+// AVP: Specific-APN-Info (1472) 3GPP (10415)
+type AVP_Grouped Specific_APN_Info;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.84
+// AVP: LCS-Info (1473) 3GPP (10415)
+type AVP_Grouped LCS_Info;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.85
+// AVP: GMLC-Number (1474) 3GPP (10415)
+type AVP_OctetString GMLC_Number;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.86
+// AVP: LCS-PrivacyException (1475) 3GPP (10415)
+type AVP_Grouped LCS_PrivacyException;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.87
+// AVP: SS-Code (1476) 3GPP (10415)
+type AVP_OctetString SS_Code;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.88
+// AVP: SS-Status (1477) 3GPP (10415)
+type AVP_OctetString SS_Status;
+
+// 3GPP TS 29.272 V13.7.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 V13.7.0
+// 7.3.90
+// AVP: External-Client (1479) 3GPP (10415)
+type AVP_Grouped External_Client;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.91
+// AVP: Client-Identity (1480) 3GPP (10415)
+type AVP_OctetString Client_Identity;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.92
+// AVP: GMLC-Restriction (1481) 3GPP (10415)
+type enumerated GMLC_Restriction
+{
+  GMLC_LIST    (0),
+  HOME_COUNTRY (1)
+}
+
+// 3GPP TS 29.272 V13.7.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 V13.7.0
+// 7.3.94
+// AVP: Service-Type (1483) 3GPP (10415)
+type AVP_Grouped Service_Type;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.95
+// AVP: ServiceTypeIdentity (1484) 3GPP (10415)
+type AVP_Unsigned32 ServiceTypeIdentity;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.96
+// AVP: MO-LR (1485) 3GPP (10415)
+type AVP_Grouped MO_LR;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.99
+// AVP: Teleservice-List (1486) 3GPP (10415)
+type AVP_Grouped Teleservice_List;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.100
+// AVP: TS-Code (1487) 3GPP (10415)
+type AVP_OctetString TS_Code;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.101
+// AVP: Call-Barring-Info (1488) 3GPP (10415)
+type AVP_Grouped Call_Barring_Info;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.102
+// AVP: SGSN-Number (1489) 3GPP (10415)
+type AVP_OctetString SGSN_Number;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.103
+// AVP: IDR-Flags (1490) 3GPP (10415)
+type AVP_Unsigned32 IDR_Flags;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.104
+// AVP: ICS-Indicator (1491) 3GPP (10415)
+type enumerated ICS_Indicator
+{
+  FALSE (0),
+  TRUE  (1)
+}
+
+// 3GPP TS 29.272 V13.7.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 V13.7.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 V13.7.0
+// 7.3.108
+// AVP: Last-UE-Activity-Time (1494) 3GPP (10415)
+type AVP_Time Last_UE_Activity_Time;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.110
+// AVP: EPS-User-State (1495) 3GPP (10415)
+type AVP_Grouped EPS_User_State;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.111
+// AVP: EPS-Location-Information (1496) 3GPP (10415)
+type AVP_Grouped EPS_Location_Information;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.112
+// AVP: MME-User-State (1497) 3GPP (10415)
+type AVP_Grouped MME_User_State;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.113
+// AVP: SGSN-User-State (1498) 3GPP (10415)
+type AVP_Grouped SGSN_User_State;
+
+// 3GPP TS 29.272 V13.7.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 V13.7.0
+// 7.3.115
+// AVP: MME-Location-Information (1600) 3GPP (10415)
+type AVP_Grouped MME_Location_Information;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.116
+// AVP: SGSN-Location-Information (1601) 3GPP (10415)
+type AVP_Grouped SGSN_Location_Information;
+
+// 3GPP TS 29.272 V13.7.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 V13.7.0
+// 7.3.118
+// AVP: Tracking-Area-Identity (1603) 3GPP (10415)
+type AVP_OctetString Tracking_Area_Identity;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.119
+// AVP: Cell-Global-Identity (1604) 3GPP (10415)
+type AVP_OctetString Cell_Global_Identity;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.120
+// AVP: Routing-Area-Identity (1605) 3GPP (10415)
+type AVP_OctetString Routing_Area_Identity;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.121
+// AVP: Location-Area-Identity (1606) 3GPP (10415)
+type AVP_OctetString Location_Area_Identity;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.122
+// AVP: Service-Area-Identity (1607) 3GPP (10415)
+type AVP_OctetString Service_Area_Identity;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.123
+// AVP: Geographical-Information (1608) 3GPP (10415)
+type AVP_OctetString Geographical_Information;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.124
+// AVP: Geodetic-Information (1609) 3GPP (10415)
+type AVP_OctetString Geodetic_Information;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.125
+// AVP: Current-Location-Retrieved (1610) 3GPP (10415)
+type enumerated Current_Location_Retrieved
+{
+  ACTIVE_LOCATION_RETRIEVAL (0)
+}
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.126
+// AVP: Age-Of-Location-Information (1611) 3GPP (10415)
+type AVP_Unsigned32 Age_Of_Location_Information;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.127
+// AVP: Active-APN (1612) 3GPP (10415)
+type AVP_Grouped Active_APN;
+
+// 3GPP TS 29.272 V13.7.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 V13.7.0
+// 7.3.129
+// AVP: Ext-PDP-Address (1621) 3GPP (10415)
+type AVP_Address Ext_PDP_Address;
+
+// 3GPP TS 29.272 V13.7.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 V13.7.0
+// 7.3.131
+// AVP: MPS-Priority (1616) 3GPP (10415)
+type AVP_Unsigned32 MPS_Priority;
+
+// 3GPP TS 29.272 V13.7.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 V13.7.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 V13.7.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 V13.7.0
+// 7.3.75A
+// AVP: Ext-PDP-Type (1620) 3GPP (10415)
+type AVP_OctetString Ext_PDP_Type;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.135
+// AVP: SIPTO-Permission (1613) 3GPP (10415)
+type enumerated SIPTO_Permission
+{
+  SIPTO_ALLOWED    (0),
+  SIPTO_NOTALLOWED (1)
+}
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.136
+// AVP: MDT-Configuration (1622) 3GPP (10415)
+type AVP_Grouped MDT_Configuration;
+
+// 3GPP TS 29.272 V13.7.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 V13.7.0
+// 7.3.138
+// AVP: Area-Scope (1624) 3GPP (10415)
+type AVP_Grouped Area_Scope;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.139
+// AVP: List-Of-Measurements (1625) 3GPP (10415)
+type AVP_Unsigned32 List_Of_Measurements;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.140
+// AVP: Reporting-Trigger (1626) 3GPP (10415)
+type AVP_Unsigned32 Reporting_Trigger;
+
+// 3GPP TS 29.272 V13.7.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 V13.7.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 V13.7.0
+// 7.3.143
+// AVP: Event-Threshold-RSRP (1629) 3GPP (10415)
+type AVP_Unsigned32 Event_Threshold_RSRP;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.144
+// AVP: Event-Threshold-RSRQ (1630) 3GPP (10415)
+type AVP_Unsigned32 Event_Threshold_RSRQ;
+
+// 3GPP TS 29.272 V13.7.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 V13.7.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 V13.7.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 V13.7.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 V13.7.0
+// 7.3.149
+// AVP: PUR-Flags (1635) 3GPP (10415)
+type AVP_Unsigned32 PUR_Flags;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.150
+// AVP: Subscribed-VSRVCC (1636) 3GPP (10415)
+type enumerated Subscribed_VSRVCC
+{
+  VSRVCC_SUBSCRIBED  (0) 
+}
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.151
+// AVP: Equivalent-PLMN-List (1637) 3GPP (10415)
+type AVP_Grouped Equivalent_PLMN_List;
+
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.152
+// AVP: CLR-Flags (1638) 3GPP (10415)
+type AVP_Unsigned32 CLR_Flags;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.153
+// AVP: UVR-Flags (1639) 3GPP (10415)
+type AVP_Unsigned32 UVR_Flags;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.154
+// AVP: UVA-Flags (1640) 3GPP (10415)
+type AVP_Unsigned32 UVA_Flags;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.155
+// AVP: VPLMN-CSG-Subscription-Data (1641) 3GPP (10415)
+type AVP_Grouped VPLMN_CSG_Subscription_Data;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.156
+// AVP: Local-Time-Zone (1649) 3GPP (10415)
+type AVP_Grouped Local_Time_Zone;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.157
+// AVP: A-MSISDN (1643) 3GPP (10415)
+type AVP_OctetString A_MSISDN;
+
+// 3GPP TS 29.272 V13.7.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 V13.7.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 V13.7.0
+// 7.3.163
+// AVP: Time-Zone (1642) 3GPP (10415)
+type AVP_UTF8String Time_Zone;
+
+// 3GPP TS 29.272 V13.7.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 V13.7.0
+// 7.3.165
+// AVP: Subscription-Data-Flags (1654) 3GPP (10415)
+type AVP_Unsigned32 Subscription_Data_Flags;
+
+// 3GPP TS 29.272 V13.7.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 V13.7.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 V13.7.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 V13.7.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 V13.7.0
+// 7.3.170
+// AVP: Positioning-Method (1659) 3GPP (10415)
+type AVP_OctetString Positioning_Method;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.171
+// AVP: Measurement_Quantity (1660) 3GPP (10415)
+type AVP_OctetString Measurement_Quantity;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.172
+// AVP: Event-Threshold-Event-1F (1661) 3GPP (10415)
+type AVP_Integer32 Event_Threshold_Event_1F;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.173
+// AVP: Event-Threshold-Event-1I (1662) 3GPP (10415)
+type AVP_Integer32 Event_Threshold_Event_1I;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.174
+// AVP: Restoration-Priority (1663) 3GPP (10415)
+type AVP_Unsigned32 Restoration_Priority;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.175
+// AVP: SGs-MME-Identity (1664) 3GPP (10415)
+type AVP_UTF8String SGs_MME_Identity;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.176
+// AVP: SIPTO-Local-Network-Permission (1665) 3GPP (10415)
+type AVP_Unsigned32 SIPTO_Local_Network_Permission;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.177
+// AVP: Coupled-Node-Diameter-ID (1666) 3GPP (10415)
+type AVP_DiameterIdentity Coupled_Node_Diameter_ID;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.181
+// AVP: WLAN-offloadability (1667) 3GPP (10415)
+type AVP_Grouped WLAN_offloadability;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.182
+// AVP: WLAN-offloadability-EUTRAN (1668) 3GPP (10415)
+type AVP_Unsigned32 WLAN_offloadability_EUTRAN;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.183
+// AVP: WLAN-offloadability-UTRAN (1669) 3GPP (10415)
+type AVP_Unsigned32 WLAN_offloadability_UTRAN;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.184
+// AVP: Reset-ID (1670) 3GPP (10415)
+type AVP_OctetString Reset_ID;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.185
+// AVP: MDT-Allowed-PLMN-Id (1671) 3GPP (10415)
+type AVP_OctetString MDT_Allowed_PLMN_Id;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.186
+// AVP: Adjacent-PLMNs (1672) 3GPP (10415)
+type AVP_Grouped Adjacent_PLMNs;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.187
+// AVP: Adjacent-Access-Restriction-Data (1673) 3GPP (10415)
+type AVP_Grouped Adjacent_Access_Restriction_Data;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.188
+// AVP: DL-Buffering-Suggested-Packet-Count (1674) 3GPP (10415)
+type AVP_Integer32 DL_Buffering_Suggested_Packet_Count;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.189
+// AVP: IMSI-Group-Id (1675) 3GPP (10415)
+type AVP_Grouped IMSI_Group_Id;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.190
+// AVP: Group-Service-Id (1676) 3GPP (10415)
+type AVP_Unsigned32 Group_Service_Id;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.191
+// AVP: Group-PLMN-Id (1677) 3GPP (10415)
+type AVP_OctetString Group_PLMN_Id;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.192
+// AVP: Local-Group-Id (1678) 3GPP (10415)
+type AVP_OctetString Local_Group_Id;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.201
+// AVP: AIR-Flags (1679) 3GPP (10415)
+type AVP_Unsigned32 AIR_Flags;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.202
+// AVP: UE-Usage-Type (1680) 3GPP (10415)
+type AVP_Unsigned32 UE_Usage_Type;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.204
+// AVP: Non-IP-PDN-Type-Indicator (1681) 3GPP (10415)
+type enumerated Non_IP_PDN_Type_Indicator
+{
+  FALSE_VALUE    (0),
+  TRUE_VALUE (1)
+}
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.205
+// AVP: Non-IP-Data-Delivery-Mechanism (1682) 3GPP (10415)
+type AVP_Unsigned32 Non_IP_Data_Delivery_Mechanism;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.206
+// AVP: Additional-Context-ID (1683) 3GPP (10415)
+type AVP_Unsigned32 Additional_Context_ID;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.207
+// AVP: SCEF-Realm (1684) 3GPP (10415)
+type AVP_DiameterIdentity SCEF_Realm;
+
+// 3GPP TS 29.272 V13.7.0
+// 7.3.209
+// AVP: Preferred-Data-Mode (1686) 3GPP (10415)
+type AVP_Unsigned32 Preferred_Data_Mode;
diff --git a/src/AAAInterface_3GPP_TS29272_f10.ddf b/src/AAAInterface_3GPP_TS29272_f10.ddf
new file mode 100644
index 0000000000000000000000000000000000000000..b18539c54f4f856dcb6508f6cb7ae83354639eed
--- /dev/null
+++ b/src/AAAInterface_3GPP_TS29272_f10.ddf
@@ -0,0 +1,1055 @@
+/******************************************************************************
+* 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_f10.ddf
+//  Description:        DDF for S6a/S6d and S13 Interfaces according to 3GPP TS 29.272 V15.1.0
+//  Rev:                R55A
+//  Prodnr:             CNL 113 462
+
+
+// APPLICATION-NAME: AAA
+// APPLICATION-REVISION: V15_1_0
+
+// AVP implementations according to: 
+// 3GPP TS 29.272 V15.1.0 - Evolved Packet System (EPS); Mobility Management Entity (MME) and Serving GPRS Support Node (SGSN) related interfaces based on Diameter protocol
+
+// 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)
+}
+
+// 7.3.2
+// AVP: Subscription-Data (1400) 3GPP (10415)
+type AVP_Grouped Subscription_Data;
+
+// 7.3.3
+// AVP: Terminal-Information (1401) 3GPP (10415)
+type AVP_Grouped Terminal_Information;
+
+// 7.3.4
+// AVP: IMEI (1402) 3GPP (10415)
+type AVP_UTF8String IMEI;
+
+// 7.3.5
+// AVP: Software-Version (1403) 3GPP (10415)
+type AVP_UTF8String Software_Version;
+
+// 7.3.77
+// AVP: QoS-Subscribed (1404) 3GPP (10415)
+type AVP_OctetString QoS_Subscribed;
+
+// 7.3.7
+// AVP: ULR-Flags (1405) 3GPP (10415)
+type AVP_Unsigned32 ULR_Flags;
+
+// 7.3.8
+// AVP: ULA-Flags (1406) 3GPP (10415)
+type AVP_Unsigned32 ULA_Flags;
+
+// 7.3.9
+// AVP: Visited-PLMN-Id (1407) 3GPP (10415) 
+type AVP_OctetString Visited_PLMN_Id;
+
+// 7.3.11
+// AVP: Requested-EUTRAN-Authentication-Info (1408) 3GPP (10415)
+type AVP_Grouped Requested_EUTRAN_Authentication_Info;
+
+// 7.3.12
+// AVP: Requested-UTRAN-GERAN-Authentication-Info (1409) 3GPP (10415)
+type AVP_Grouped Requested_UTRAN_GERAN_Authentication_Info;
+
+// 7.3.14
+// AVP: Number-Of-Requested-Vectors (1410) 3GPP (10415)
+type AVP_Unsigned32 Number_Of_Requested_Vectors;
+
+// 7.3.15
+// AVP: Re-Synchronization-Info (1411) 3GPP (10415)
+type AVP_OctetString Re_Synchronization_Info;
+
+// 7.3.16
+// AVP: Immediate-Response-Preferred (1412) 3GPP (10415)
+type AVP_Unsigned32 Immediate_Response_Preferred;
+
+// 7.3.17
+// AVP: Authentication-Info (1413) 3GPP (10415)
+type AVP_Grouped Authentication_Info;
+
+// 7.3.18
+// AVP: E-UTRAN-Vector (1414) 3GPP (10415)
+type AVP_Grouped E_UTRAN_Vector;
+
+// 7.3.19
+// AVP: UTRAN-Vector (1415) 3GPP (10415)
+type AVP_Grouped UTRAN_Vector;
+
+// 7.3.20
+// AVP: GERAN-Vector (1416) 3GPP (10415)
+type AVP_Grouped GERAN_Vector;
+
+// 7.3.21
+// AVP: Network-Access-Mode (1417) 3GPP (10415)
+type enumerated Network_Access_Mode
+{
+  PACKET_AND_CIRCUIT (0),
+  Reserved           (1),
+  ONLY_PACKET        (2)
+}
+
+// 7.3.22
+// AVP: HPLMN-ODB (1418) 3GPP (10415)
+type AVP_Unsigned32 HPLMN_ODB;
+
+// 7.3.23
+// AVP: Item-Number (1419) 3GPP (10415)
+type AVP_Unsigned32 Item_Number;
+
+// 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)
+}
+
+// 7.3.25
+// AVP: DSR-Flags (1421) 3GPP (10415)
+type AVP_Unsigned32 DSR_Flags;
+
+// 7.3.26
+// AVP: DSA-Flags (1422) 3GPP (10415)
+type AVP_Unsigned32 DSA_Flags;
+
+// 7.3.27
+// AVP: Context-Identifier (1423) 3GPP (10415)
+type AVP_Unsigned32 Context_Identifier;
+
+// 7.3.29
+// AVP: Subscriber-Status (1424) 3GPP (10415)
+type enumerated Subscriber_Status
+{
+  SERVICE_GRANTED             (0),
+  OPERATOR_DETERMINED_BARRING (1)
+}
+
+// 7.3.30
+// AVP: Operator-Determined-Barring (1425) 3GPP (10415)
+type AVP_Unsigned32 Operator_Determined_Barring;
+
+// 7.3.31
+// AVP: Access-Restriction-Data (1426) 3GPP (10415)
+type AVP_Unsigned32 Access_Restriction_Data;
+
+// 7.3.32
+// AVP: APN-OI-Replacement (1427) 3GPP (10415)
+type AVP_UTF8String APN_OI_Replacement;
+
+// 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)
+}
+
+// 7.3.34
+// AVP: APN-Configuration-Profile (1429) 3GPP (10415)
+type AVP_Grouped APN_Configuration_Profile;
+
+// 7.3.35
+// AVP: APN-Configuration (1430) 3GPP (10415)
+type AVP_Grouped APN_Configuration;
+
+// 7.3.37
+// AVP: EPS-Subscribed-QoS-Profile (1431) 3GPP (10415)
+type AVP_Grouped EPS_Subscribed_QoS_Profile;
+
+// 7.3.38
+// AVP: VPLMN-Dynamic-Address-Allowed (1432) 3GPP (10415)
+type enumerated VPLMN_Dynamic_Address_Allowed
+{
+  NOTALLOWED (0),
+  ALLOWED    (1)  
+}
+
+// 7.3.39
+// AVP: STN-SR (1433) 3GPP (10415)
+type AVP_OctetString STN_SR;
+
+// 7.3.83
+// AVP: Alert-Reason (1434) 3GPP (10415)
+type enumerated Alert_Reason;
+{
+  UE_PRESENT          (0),
+  UE_MEMORY_AVAILABLE (1)
+}
+
+// 7.3.41
+// AVP: AMBR (1435) 3GPP (10415)
+type AVP_Grouped AMBR;
+
+// 7.3.78
+// AVP: CSG-Subscription-Data (1436) 3GPP (10415)
+type AVP_Grouped CSG_Subscription_Data;
+
+// 7.3.79
+// AVP: CSG-Id (1437) 3GPP (10415)
+type AVP_Unsigned32 CSG_Id;
+
+// 7.3.44
+// AVP: PDN-GW-Allocation-Type (1438) 3GPP (10415)
+type enumerated PDN_GW_Allocation_Type
+{
+  STATIC  (0),
+  DYNAMIC (1)
+}
+
+// 7.3.80
+// AVP: Expiration-Date (1439) 3GPP (10415)
+type AVP_Time Expiration_Date;
+
+// 7.3.46
+// AVP: RAT-Frequency-Selection-Priority-ID (1440) 3GPP (10415)
+type AVP_Unsigned32 RAT_Frequency_Selection_Priority_ID;
+
+// 7.3.47
+// AVP: IDA-Flags (1441) 3GPP (10415)
+type AVP_Unsigned32 IDA_Flags;
+
+// 7.3.48
+// AVP: PUA-Flags (1442) 3GPP (10415)
+type AVP_Unsigned32 PUA_Flags;
+
+// 7.3.49
+// AVP: NOR-Flags (1443) 3GPP (10415)
+type AVP_Unsigned32 NOR_Flags;
+
+// 7.3.50
+// AVP: User-Id (1444) 3GPP (10415)
+type AVP_UTF8String User_Id;
+
+// 7.3.51
+// AVP: Equipment-Status (1445) 3GPP (10415)
+type enumerated Equipment_Status
+{
+  WHITELISTED (0),
+  BLACKLISTED (1),
+  GREYLISTED  (2)
+}
+
+// 7.3.52
+// AVP: Regional-Subscription-Zone-Code (1446) 3GPP (10415)
+type AVP_OctetString Regional_Subscription_Zone_Code;
+
+// 7.3.53
+// AVP: RAND (1447) 3GPP (10415)
+type AVP_OctetString RAND;
+
+// 7.3.54
+// AVP: XRES (1448) 3GPP (10415)
+type AVP_OctetString XRES;
+
+// 7.3.55
+// AVP: AUTN (1449) 3GPP (10415)
+type AVP_OctetString AUTN;
+
+// 7.3.56
+// AVP: KASME (1450) 3GPP (10415)
+type AVP_OctetString KASME;
+
+// 7.3.98
+// AVP: Trace-Collection-Entity (1452) 3GPP (10415)
+type AVP_Address Trace_Collection_Entity;
+
+// 7.3.59
+// AVP: Kc (1453) 3GPP (10415)
+type AVP_OctetString Kc;
+
+// 7.3.60
+// AVP: SRES (1454) 3GPP (10415)
+type AVP_OctetString SRES;
+
+// 7.3.62
+// AVP: PDN-Type (1456) 3GPP (10415)
+type enumerated PDN_Type;
+{
+  IPv4 (0),
+  IPv6 (1),
+  IPv4v6 (2),
+  IPv4_OR_IPv6 (3)  
+}
+
+// 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)
+}
+
+// 7.3.63
+// AVP: Trace-Data (1458) 3GPP (10415)
+type AVP_Grouped Trace_Data;
+
+// 7.3.64
+// AVP: Trace-Reference (1459) 3GPP (10415)
+type AVP_OctetString Trace_Reference;
+
+// 7.3.67
+// AVP: Trace-Depth (1462) 3GPP (10415)
+// FS 3.3.2.10
+type AVP_Unsigned32 Trace_Depth;
+
+// 7.3.68
+// AVP: Trace-NE-Type-List (1463) 3GPP (10415)
+type AVP_OctetString Trace_NE_Type_List;
+
+// 7.3.69
+// AVP: Trace-Interface-List (1464) 3GPP (10415)
+type AVP_OctetString Trace_Interface_List;
+
+// 7.3.70
+// AVP: Trace-Event-List (1465) 3GPP (10415)
+type AVP_OctetString Trace_Event_List;
+
+// 7.3.71
+// AVP: OMC-Id (1466) 3GPP (10415)
+type AVP_OctetString OMC_Id;
+
+// 7.3.72
+// AVP: GPRS-Subscription-Data (1467) 3GPP (10415)
+type AVP_Grouped GPRS_Subscription_Data;
+
+// 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)
+}
+
+// 7.3.74
+// AVP: PDP-Context (1469) 3GPP (10415)
+type AVP_Grouped PDP_Context;
+
+// 7.3.75
+// AVP: PDP-Type (1470) 3GPP (10415)
+type AVP_OctetString PDP_Type;
+
+// 7.3.6
+// AVP: 3GPP2-MEID (1471) 3GPP (10415)
+type AVP_OctetString 3GPP2_MEID;
+
+// 7.3.82
+// AVP: Specific-APN-Info (1472) 3GPP (10415)
+type AVP_Grouped Specific_APN_Info;
+
+// 7.3.84
+// AVP: LCS-Info (1473) 3GPP (10415)
+type AVP_Grouped LCS_Info;
+
+// 7.3.85
+// AVP: GMLC-Number (1474) 3GPP (10415)
+type AVP_OctetString GMLC_Number;
+
+// 7.3.86
+// AVP: LCS-PrivacyException (1475) 3GPP (10415)
+type AVP_Grouped LCS_PrivacyException;
+
+// 7.3.87
+// AVP: SS-Code (1476) 3GPP (10415)
+type AVP_OctetString SS_Code;
+
+// 7.3.88
+// AVP: SS-Status (1477) 3GPP (10415)
+type AVP_OctetString SS_Status;
+
+// 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)
+}
+
+// 7.3.90
+// AVP: External-Client (1479) 3GPP (10415)
+type AVP_Grouped External_Client;
+
+// 7.3.91
+// AVP: Client-Identity (1480) 3GPP (10415)
+type AVP_OctetString Client_Identity;
+
+// 7.3.92
+// AVP: GMLC-Restriction (1481) 3GPP (10415)
+type enumerated GMLC_Restriction
+{
+  GMLC_LIST    (0),
+  HOME_COUNTRY (1)
+}
+
+// 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)
+}
+
+// 7.3.94
+// AVP: Service-Type (1483) 3GPP (10415)
+type AVP_Grouped Service_Type;
+
+// 7.3.95
+// AVP: ServiceTypeIdentity (1484) 3GPP (10415)
+type AVP_Unsigned32 ServiceTypeIdentity;
+
+// 7.3.96
+// AVP: MO-LR (1485) 3GPP (10415)
+type AVP_Grouped MO_LR;
+
+// 7.3.99
+// AVP: Teleservice-List (1486) 3GPP (10415)
+type AVP_Grouped Teleservice_List;
+
+// 7.3.100
+// AVP: TS-Code (1487) 3GPP (10415)
+type AVP_OctetString TS_Code;
+
+// 7.3.101
+// AVP: Call-Barring-Info (1488) 3GPP (10415)
+type AVP_Grouped Call_Barring_Info;
+
+// 7.3.102
+// AVP: SGSN-Number (1489) 3GPP (10415)
+type AVP_OctetString SGSN_Number;
+
+// 7.3.103
+// AVP: IDR-Flags (1490) 3GPP (10415)
+type AVP_Unsigned32 IDR_Flags;
+
+// 7.3.104
+// AVP: ICS-Indicator (1491) 3GPP (10415)
+type enumerated ICS_Indicator
+{
+  FALSE (0),
+  TRUE  (1)
+}
+
+// 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)
+}
+
+// 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)
+}
+
+// 7.3.108
+// AVP: Last-UE-Activity-Time (1494) 3GPP (10415)
+type AVP_Time Last_UE_Activity_Time;
+
+// 7.3.110
+// AVP: EPS-User-State (1495) 3GPP (10415)
+type AVP_Grouped EPS_User_State;
+
+// 7.3.111
+// AVP: EPS-Location-Information (1496) 3GPP (10415)
+type AVP_Grouped EPS_Location_Information;
+
+// 7.3.112
+// AVP: MME-User-State (1497) 3GPP (10415)
+type AVP_Grouped MME_User_State;
+
+// 7.3.113
+// AVP: SGSN-User-State (1498) 3GPP (10415)
+type AVP_Grouped SGSN_User_State;
+
+// 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)
+}
+
+// 7.3.115
+// AVP: MME-Location-Information (1600) 3GPP (10415)
+type AVP_Grouped MME_Location_Information;
+
+// 7.3.116
+// AVP: SGSN-Location-Information (1601) 3GPP (10415)
+type AVP_Grouped SGSN_Location_Information;
+
+// 7.3.117
+// AVP: E-UTRAN-Cell-Global-Identity (1602) 3GPP (10415)
+type AVP_OctetString E_UTRAN_Cell_Global_Identity;
+
+// 7.3.118
+// AVP: Tracking-Area-Identity (1603) 3GPP (10415)
+type AVP_OctetString Tracking_Area_Identity;
+
+// 7.3.119
+// AVP: Cell-Global-Identity (1604) 3GPP (10415)
+type AVP_OctetString Cell_Global_Identity;
+
+// 7.3.120
+// AVP: Routing-Area-Identity (1605) 3GPP (10415)
+type AVP_OctetString Routing_Area_Identity;
+
+// 7.3.121
+// AVP: Location-Area-Identity (1606) 3GPP (10415)
+type AVP_OctetString Location_Area_Identity;
+
+// 7.3.122
+// AVP: Service-Area-Identity (1607) 3GPP (10415)
+type AVP_OctetString Service_Area_Identity;
+
+// 7.3.123
+// AVP: Geographical-Information (1608) 3GPP (10415)
+type AVP_OctetString Geographical_Information;
+
+// 7.3.124
+// AVP: Geodetic-Information (1609) 3GPP (10415)
+type AVP_OctetString Geodetic_Information;
+
+// 7.3.125
+// AVP: Current-Location-Retrieved (1610) 3GPP (10415)
+type enumerated Current_Location_Retrieved
+{
+  ACTIVE_LOCATION_RETRIEVAL (0)
+}
+
+// 7.3.126
+// AVP: Age-Of-Location-Information (1611) 3GPP (10415)
+type AVP_Unsigned32 Age_Of_Location_Information;
+
+// 7.3.127
+// AVP: Active-APN (1612) 3GPP (10415)
+type AVP_Grouped Active_APN;
+
+// 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)
+}
+
+// 7.3.129
+// AVP: Ext-PDP-Address (1621) 3GPP (10415)
+type AVP_Address Ext_PDP_Address;
+
+// 7.3.130
+// AVP: UE-SRVCC-Capability (1615) 3GPP (10415)
+type enumerated UE_SRVCC_Capability
+{
+  UE_SRVCC_NOT_SUPPORTED	(0),
+  UE_SRVCC_SUPPORTED	 	(1)
+}
+
+// 7.3.131
+// AVP: MPS-Priority (1616) 3GPP (10415)
+type AVP_Unsigned32 MPS_Priority;
+
+// 7.3.132
+// AVP: VPLMN-LIPA-Allowed (1617) 3GPP (10415)
+type enumerated VPLMN_LIPA_Allowed
+{
+  LIPA_NOTALLOWED (0),
+  LIPA_ALLOWED (1)
+}
+
+// 7.3.133
+// AVP: LIPA-Permission (1618) 3GPP (10415)
+type enumerated LIPA_Permission
+{
+  LIPA_PROHIBITED (0),
+  LIPA_ONLY (1),
+  LIPA_CONDITIONAL (2)
+}
+
+// 7.3.134
+// AVP: Subscribed-Periodic-RAU-TAU-Timer (1619) 3GPP (10415)
+type AVP_Unsigned32 Subscribed_Periodic_RAU_TAU_Timer;
+
+// 7.3.75A
+// AVP: Ext-PDP-Type (1620) 3GPP (10415)
+type AVP_OctetString Ext_PDP_Type;
+
+// 7.3.135
+// AVP: SIPTO-Permission (1613) 3GPP (10415)
+type enumerated SIPTO_Permission
+{
+  SIPTO_ALLOWED    (0),
+  SIPTO_NOTALLOWED (1)
+}
+
+// 7.3.136
+// AVP: MDT-Configuration (1622) 3GPP (10415)
+type AVP_Grouped MDT_Configuration;
+
+// 7.3.137, TS 32.422 v15.0.0 - 5.9a
+// 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),
+  RLF_REPORTS_ONLY (4),
+  RCEF_REPORTS_ONLY (5),
+  LOGGED_MBSFN_MDT (6)
+}
+
+// 7.3.138
+// AVP: Area-Scope (1624) 3GPP (10415)
+type AVP_Grouped Area_Scope;
+
+// 7.3.139
+// AVP: List-Of-Measurements (1625) 3GPP (10415)
+type AVP_Unsigned32 List_Of_Measurements;
+
+// 7.3.140
+// AVP: Reporting-Trigger (1626) 3GPP (10415)
+type AVP_Unsigned32 Reporting_Trigger;
+
+// 7.3.141, TS 32.422 v15.0.0  -  5.10.5
+// 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)
+}
+
+// 7.3.142, TS 32.422 v15.0.0 - 5.10.6
+// 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)
+}
+
+// 7.3.143
+// AVP: Event-Threshold-RSRP (1629) 3GPP (10415)
+type AVP_Unsigned32 Event_Threshold_RSRP;
+
+// 7.3.144
+// AVP: Event-Threshold-RSRQ (1630) 3GPP (10415)
+type AVP_Unsigned32 Event_Threshold_RSRQ;
+
+// 7.3.145, TS 32.422 v15.0.0 - 5.10.8
+// 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)
+}
+
+// 7.3.146, TS 32.422 v15.0.0 - 5.10.9
+// 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)
+}
+
+// 7.3.147
+// AVP: Relay-Node-Indicator (1633) 3GPP (10415)
+type enumerated Relay_Node_Indicator
+{
+  NOT_RELAY_NODE (0),
+  RELAY_NODE	 (1)
+}
+
+// 7.3.148
+// AVP: MDT-User-Consent (1634) 3GPP (10415)
+type enumerated MDT_User_Consent 
+{
+  CONSENT_NOT_GIVEN 	(0),
+  CONSENT_GIVEN 	(1)
+}
+
+// 7.3.149
+// AVP: PUR-Flags (1635) 3GPP (10415)
+type AVP_Unsigned32 PUR_Flags;
+
+// 7.3.150
+// AVP: Subscribed-VSRVCC (1636) 3GPP (10415)
+type enumerated Subscribed_VSRVCC
+{
+  VSRVCC_SUBSCRIBED  (0) 
+}
+
+// 7.3.151
+// AVP: Equivalent-PLMN-List (1637) 3GPP (10415)
+type AVP_Grouped Equivalent_PLMN_List;
+
+
+// 7.3.152
+// AVP: CLR-Flags (1638) 3GPP (10415)
+type AVP_Unsigned32 CLR_Flags;
+
+// 7.3.153
+// AVP: UVR-Flags (1639) 3GPP (10415)
+type AVP_Unsigned32 UVR_Flags;
+
+// 7.3.154
+// AVP: UVA-Flags (1640) 3GPP (10415)
+type AVP_Unsigned32 UVA_Flags;
+
+// 7.3.155
+// AVP: VPLMN-CSG-Subscription-Data (1641) 3GPP (10415)
+type AVP_Grouped VPLMN_CSG_Subscription_Data;
+
+// 7.3.156
+// AVP: Local-Time-Zone (1649) 3GPP (10415)
+type AVP_Grouped Local_Time_Zone;
+
+// 7.3.157
+// AVP: A-MSISDN (1643) 3GPP (10415)
+type AVP_OctetString A_MSISDN;
+
+// 7.3.159
+// AVP: MME-Number-for-MT-SMS (1645) 3GPP (10415)
+type AVP_OctetString MME_Number_for_MT_SMS;
+
+// 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)
+}
+
+// 7.3.163
+// AVP: Time-Zone (1642) 3GPP (10415)
+type AVP_UTF8String Time_Zone;
+
+// 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)
+}
+
+// 7.3.165
+// AVP: Subscription-Data-Flags (1654) 3GPP (10415)
+type AVP_Unsigned32 Subscription_Data_Flags;
+
+// 7.3.166, TS 32.422 v15.0.0 - 5.10.23
+// 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)
+}
+
+// 7.3.167, TS 32.422 v15.0.0 - 5.10.22
+// 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)
+}
+
+// 7.3.168, TS 32.422 v15.0.0 - 5.10.20
+// 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)
+}
+
+// 7.3.169, TS 32.422 v15.0.0 - 5.10.22
+// 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)
+}
+
+// 7.3.170
+// AVP: Positioning-Method (1659) 3GPP (10415)
+type AVP_OctetString Positioning_Method;
+
+// 7.3.171
+// AVP: Measurement_Quantity (1660) 3GPP (10415)
+type AVP_OctetString Measurement_Quantity;
+
+// 7.3.172
+// AVP: Event-Threshold-Event-1F (1661) 3GPP (10415)
+type AVP_Integer32 Event_Threshold_Event_1F;
+
+// 7.3.173
+// AVP: Event-Threshold-Event-1I (1662) 3GPP (10415)
+type AVP_Integer32 Event_Threshold_Event_1I;
+
+// 7.3.174
+// AVP: Restoration-Priority (1663) 3GPP (10415)
+type AVP_Unsigned32 Restoration_Priority;
+
+// 7.3.175
+// AVP: SGs-MME-Identity (1664) 3GPP (10415)
+type AVP_UTF8String SGs_MME_Identity;
+
+// 7.3.176
+// AVP: SIPTO-Local-Network-Permission (1665) 3GPP (10415)
+type AVP_Unsigned32 SIPTO_Local_Network_Permission;
+
+// 7.3.177
+// AVP: Coupled-Node-Diameter-ID (1666) 3GPP (10415)
+type AVP_DiameterIdentity Coupled_Node_Diameter_ID;
+
+// 7.3.181
+// AVP: WLAN-offloadability (1667) 3GPP (10415)
+type AVP_Grouped WLAN_offloadability;
+
+// 7.3.182
+// AVP: WLAN-offloadability-EUTRAN (1668) 3GPP (10415)
+type AVP_Unsigned32 WLAN_offloadability_EUTRAN;
+
+// 7.3.183
+// AVP: WLAN-offloadability-UTRAN (1669) 3GPP (10415)
+type AVP_Unsigned32 WLAN_offloadability_UTRAN;
+
+// 7.3.184
+// AVP: Reset-ID (1670) 3GPP (10415)
+type AVP_OctetString Reset_ID;
+
+// 7.3.185
+// AVP: MDT-Allowed-PLMN-Id (1671) 3GPP (10415)
+type AVP_OctetString MDT_Allowed_PLMN_Id;
+
+// 7.3.186
+// AVP: Adjacent-PLMNs (1672) 3GPP (10415)
+type AVP_Grouped Adjacent_PLMNs;
+
+// 7.3.187
+// AVP: Adjacent-Access-Restriction-Data (1673) 3GPP (10415)
+type AVP_Grouped Adjacent_Access_Restriction_Data;
+
+// 7.3.188
+// AVP: DL-Buffering-Suggested-Packet-Count (1674) 3GPP (10415)
+type AVP_Integer32 DL_Buffering_Suggested_Packet_Count;
+
+// 7.3.189
+// AVP: IMSI-Group-Id (1675) 3GPP (10415)
+type AVP_Grouped IMSI_Group_Id;
+
+// 7.3.190
+// AVP: Group-Service-Id (1676) 3GPP (10415)
+type AVP_Unsigned32 Group_Service_Id;
+
+// 7.3.191
+// AVP: Group-PLMN-Id (1677) 3GPP (10415)
+type AVP_OctetString Group_PLMN_Id;
+
+// 7.3.192
+// AVP: Local-Group-Id (1678) 3GPP (10415)
+type AVP_OctetString Local_Group_Id;
+
+// 7.3.201
+// AVP: AIR-Flags (1679) 3GPP (10415)
+type AVP_Unsigned32 AIR_Flags;
+
+// 7.3.202
+// AVP: UE-Usage-Type (1680) 3GPP (10415)
+type AVP_Unsigned32 UE_Usage_Type;
+
+// 7.3.204
+// AVP: Non-IP-PDN-Type-Indicator (1681) 3GPP (10415)
+type enumerated Non_IP_PDN_Type_Indicator
+{
+  FALSE_VALUE (0),
+  TRUE_VALUE  (1)
+}
+
+// 7.3.205
+// AVP: Non-IP-Data-Delivery-Mechanism (1682) 3GPP (10415)
+type AVP_Unsigned32 Non_IP_Data_Delivery_Mechanism;
+
+// 7.3.206
+// AVP: Additional-Context-ID (1683) 3GPP (10415)
+type AVP_Unsigned32 Additional_Context_ID;
+
+// 7.3.207
+// AVP: SCEF-Realm (1684) 3GPP (10415)
+type AVP_DiameterIdentity SCEF_Realm;
+
+// 7.3.208
+// AVP: Subscription-Data-Deletion (1685) 3GPP (10415)
+type AVP_Grouped Subscription_Data_Deletion;
+
+// 7.3.209
+// AVP: Preferred-Data-Mode (1686) 3GPP (10415)
+type AVP_Grouped Preferred_Data_Mode;
+
+// 7.3.210
+// AVP: Emergency-Info (1687) 3GPP (10415)
+type AVP_Grouped Emergency_Info;
+
+// 7.3.212
+// AVP: V2X-Subscription-Data (1688) 3GPP (10415)
+type AVP_Grouped V2X_Subscription_Data;
+
+// 7.3.213
+// AVP: V2X-Permission (1689) 3GPP (10415)
+type AVP_Unsigned32 V2X_Permission;
+
+// 7.3.214
+// AVP: PDN-Connection-Continuity (1690) 3GPP (10415)
+type AVP_Unsigned32 PDN_Connection_Continuity;
+
+// 7.3.215
+// AVP: eDRX-Cycle-Length (1691) 3GPP (10415)
+type AVP_Grouped eDRX_Cycle_Length;
+
+// 7.3.216
+// AVP: eDRX-Cycle-Length-Value (1692) 3GPP (10415)
+type AVP_OctetString eDRX_Cycle_Length_Value;
+
+// 7.3.217
+// AVP: UE-PC5-AMBR (1693) 3GPP (10415)
+type AVP_Unsigned32 UE_PC5_AMBR;
+
+// 7.3.219
+// AVP: MBSFN-Area (1694) 3GPP (10415)
+type AVP_Grouped MBSFN_Area;
+
+// 7.3.220
+// AVP: MBSFN-Area-ID (1695) 3GPP (10415)
+type AVP_Unsigned32 MBSFN_Area_ID;
+
+// 7.3.221
+// AVP: Carrier-Frequency (1696) 3GPP (10415)
+type AVP_Unsigned32 Carrier_Frequency;
+
+// 7.3.222
+// AVP: RDS-Indicator (1697) 3GPP (10415)
+type enumerated RDS_Indicator
+{
+  DISABLED (0),
+  ENABLED  (1)
+}
+
diff --git a/src/AAAInterface_3GPP_TS29273_840.ddf b/src/AAAInterface_3GPP_TS29273_840.ddf
index bf7a04927761d0096c40b6b9fc35824b28922d8a..50d0d42d9b6525e49a1e28b0d80b7be3ed95bf6f 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/AAAInterface_3GPP_TS29273_940.ddf b/src/AAAInterface_3GPP_TS29273_940.ddf
index c36fa2c0cc60903a5c5e5fe3142b562eacbed26d..a3adf2e729785f43a3b0eb8783c7ea1c9db10af0 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/AAAInterface_3GPP_TS29273_b30.ddf b/src/AAAInterface_3GPP_TS29273_b30.ddf
index 16675a4465e4fe273bb904a175432b54c7c7a394..468eceafbae7b9356727141cc8ffeb282cff7ff2 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/AAAInterface_3GPP_TS29273_d60.ddf b/src/AAAInterface_3GPP_TS29273_d60.ddf
new file mode 100644
index 0000000000000000000000000000000000000000..2a2151bb3eb29c25a31c0a2d17bad1868be9ac46
--- /dev/null
+++ b/src/AAAInterface_3GPP_TS29273_d60.ddf
@@ -0,0 +1,114 @@
+/******************************************************************************
+* Copyright (c) 2004, 2017  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:               AAAInterface_3GPP_TS29273_940.ddf
+//  Description:        DDF for EPS AAA according to 3GPP TS 29.273 V13.6.0
+//  Rev:                R55A
+//  Prodnr:             CNL 113 462
+///////////////////////////////////////////////
+
+
+// APPLICATION-NAME: AAA
+// APPLICATION-REVISION: V13_6_0
+
+// AVP implementations according to: 
+// 3GPP TS 29.273 V13.6.0 - EPS AAA interfaces based on the Diameter protocol
+// Statement of Compiance  X/174 02-AXB 250 20 Uen PA4
+
+// Dependant applications
+// IETF RFC 3588   - Diameter Base Protocol
+// IETF RFC 4005   - Diameter Network Access Server Application
+
+// 3GPP TS 29.273 V13.6.0  9.2.2
+type enumerated Command_Code {  
+  AA                     (265),
+  Session_Termination    (275), 
+  Abort_Session          (274)  
+}
+
+// 3GPP 29.273 V13.6.0
+// AVP: Non-3GPP-User-Data (1500) 3GPP (10415)
+// 8.2.3.1
+type AVP_Grouped Non_3GPP_User_Data
+
+// 3GPP 29.273 V13.6.0
+// AVP: Non-3GPP-IP-Access (1501) 3GPP (10415)
+// 8.2.3.3
+type enumerated Non_3GPP_IP_Access {
+  NON_3GPP_SUBSCRIPTION_ALLOWED      (0),
+  NON_3GPP_SUBSCRIPTION_BARRED       (1)
+}
+
+// 3GPP 29.273 V13.6.0
+// AVP: Non-3GPP-IP-Access-APN (1502) 3GPP (10415)
+// 8.2.3.4
+type enumerated Non_3GPP_IP_Access_APN {
+  NON_3GPP_APNS_ENABLE               (0),
+  NON_3GPP_APNS_DISABLE              (1)
+}
+
+// 3GPP 29.273 V13.6.0
+// AVP: AN-Trusted (1503) 3GPP (10415)
+// 5.2.3.9
+type enumerated AN_Trusted {
+  TRUSTED                            (0),
+  UNTRUSTED                          (1)
+}
+
+// 3GPP 29.273 V13.6.0
+// AVP: ANID (1504) 3GPP (10415)
+// 5.2.3.7
+type AVP_UTF8String ANID
+
+// 3GPP 29.273 V13.6.0
+// AVP: Trace-Info (1505) 3GPP (10415)
+// 8.2.3.13
+type AVP_Grouped Trace_Info
+
+// 3GPP 29.273 V13.6.0
+// AVP: MIP-FA-RK (1506) 3GPP (10415)
+// 5.2.3.12
+type AVP_OctetString MIP_FA_RK
+
+// 3GPP 29.273 V13.6.0
+// AVP: MIP-FA-RK-SPI (1507) 3GPP (10415)
+// 5.2.3.13
+type AVP_Unsigned32 MIP_FA_RK_SPI
+
+
+
+
+// 3GPP 29.273 V13.6.0
+// AVP: Trust-Relationship-Update (1515) 3GPP (10415)
+// 9.2.3.1.4
+type enumerated Trust_Relationship_Update {
+  REQUEST_UPDATE          (1)
+}
+
+// 3GPP 29.273 V13.6.0
+// AVP: RAR-Flags (1522) 3GPP (10415)
+// 9.2.3.1.5
+type AVP_Unsigned32 RAR_Flags
+
+
+
+// 3GPP 29.273 V13.6.0
+// AVP: Origination-Time-Stamp (1536) 3GPP (10415)
+// 9.2.3.2.6
+type AVP_Unsigned64 Origination_Time_Stamp
+
+// 3GPP 29.273 V13.6.0
+// AVP: Maximum-Wait-Time (1537) 3GPP (10415)
+// 9.2.3.2.7
+type AVP_Unsigned32 Maximum_Wait_Time
+
+
+
diff --git a/src/AAAInterface_3GPP_TS29273_f00.ddf b/src/AAAInterface_3GPP_TS29273_f00.ddf
new file mode 100644
index 0000000000000000000000000000000000000000..c4616f6ad12e8f6e015bb3240b6fea24d238fdbe
--- /dev/null
+++ b/src/AAAInterface_3GPP_TS29273_f00.ddf
@@ -0,0 +1,211 @@
+/******************************************************************************
+* Copyright (c) 2004, 2017  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:               AAAInterface_3GPP_TS29273_f00.ddf
+//  Description:        DDF for EPS AAA according to 3GPP TS 29.273 V15.0.0
+//  Rev:                R55A
+//  Prodnr:             CNL 113 462
+///////////////////////////////////////////////
+
+
+// APPLICATION-NAME: AAA
+// APPLICATION-REVISION: V15_0_0
+
+// AVP implementations according to: 
+// 3GPP TS 29.273 V15.0.0 - EPS AAA interfaces based on the Diameter protocol
+
+// Dependant applications
+// IETF RFC 3588   - Diameter Base Protocol
+// IETF RFC 4005   - Diameter Network Access Server Application
+
+// 9.2.2
+type enumerated Command_Code {  
+  AA                     (265),
+  Session_Termination    (275), 
+  Abort_Session          (274)  
+}
+
+// 8.2.3.1
+// AVP: Non-3GPP-User-Data (1500) 3GPP (10415)
+type AVP_Grouped Non_3GPP_User_Data;
+
+// 8.2.3.3
+// AVP: Non-3GPP-IP-Access (1501) 3GPP (10415)
+type enumerated Non_3GPP_IP_Access {
+  NON_3GPP_SUBSCRIPTION_ALLOWED      (0),
+  NON_3GPP_SUBSCRIPTION_BARRED       (1)
+}
+
+// 8.2.3.4
+// AVP: Non-3GPP-IP-Access-APN (1502) 3GPP (10415)
+type enumerated Non_3GPP_IP_Access_APN {
+  NON_3GPP_APNS_ENABLE               (0),
+  NON_3GPP_APNS_DISABLE              (1)
+}
+
+// 5.2.3.9
+// AVP: AN-Trusted (1503) 3GPP (10415)
+type enumerated AN_Trusted {
+  TRUSTED                            (0),
+  UNTRUSTED                          (1)
+}
+
+// 5.2.3.7
+// AVP: ANID (1504) 3GPP (10415)
+type AVP_UTF8String ANID;
+
+// 8.2.3.13
+// AVP: Trace-Info (1505) 3GPP (10415)
+type AVP_Grouped Trace_Info;
+
+// 5.2.3.12
+// AVP: MIP-FA-RK (1506) 3GPP (10415)
+type AVP_OctetString MIP_FA_RK;
+
+// 5.2.3.13
+// AVP: MIP-FA-RK-SPI (1507) 3GPP (10415)
+type AVP_Unsigned32 MIP_FA_RK_SPI;
+
+// 5.2.3.17
+// AVP: PPR-Flags (1508) 3GPP (10415)
+type AVP_Unsigned32 PPR_Flags;
+
+// 5.2.3.18
+// AVP: WLAN-Identifier (1509) 3GPP (10415)
+type AVP_Grouped WLAN_Identifier;
+
+// 8.2.3.19
+// AVP: TWAN-Access-Info (1510) 3GPP (10415)
+type AVP_Grouped TWAN_Access_Info;
+
+// 8.2.3.20
+// AVP: Access-Authorization-Flags (1511) 3GPP (10415)
+type AVP_Unsigned32 Access_Authorization_Flags;
+
+// 8.2.3.18
+// AVP: TWAN-Default-APN-Context-Id (1512) 3GPP (10415)
+type AVP_Unsigned32 TWAN_Default_APN_Context_Id;
+
+// 9.2.3.1.4
+// AVP: Trust-Relationship-Update (1515) 3GPP (10415)
+type enumerated Trust_Relationship_Update {
+  REQUEST_UPDATE          (1)
+}
+
+// 5.2.3.14
+// AVP: Full-Network-Name (1516) 3GPP (10415)
+type AVP_OctetString Full_Network_Name;
+
+// 5.2.3.15
+// AVP: Short-Network-Name (1517) 3GPP (10415)
+type AVP_OctetString Short_Network_Name;
+
+// 8.2.3.21
+// AVP: AAA-Failure-Indication (1518) 3GPP (10415)
+type AVP_Unsigned32 AAA_Failure_Indication;
+
+// 5.2.3.19
+// AVP: Transport-Access-Type (1519) 3GPP (10415)
+type enumerated Transport_Access_Type
+{
+  BBF  (0)
+}
+
+// 5.2.3.20
+// AVP: DER-Flags (1520) 3GPP (10415)
+type AVP_Unsigned32 DER_Flags;
+
+// 5.2.3.21
+// AVP: DEA-Flags (1521) 3GPP (10415)
+type AVP_Unsigned32 DEA_Flags;
+
+// 9.2.3.1.5
+// AVP: RAR-Flags (1522) 3GPP (10415)
+type AVP_Unsigned32 RAR_Flags;
+
+// 9.2.3.7
+// AVP: DER-S6b-Flags (1523) 3GPP (10415)
+type AVP_Unsigned32 DER_S6b_Flags;
+
+// 5.2.3.22
+// AVP: SSID (1524) 3GPP (10415)
+type AVP_UTF8String SSID;
+
+// 5.2.3.23
+// AVP: HESSID (1525) 3GPP (10415)
+type AVP_UTF8String HESSID;
+
+
+// 5.2.3.24
+// AVP: Access-Network-Info (1526) 3GPP (10415)
+type AVP_Grouped Access_Network_Info;
+
+// 5.2.3.25
+// AVP: TWAN-Connection-Mode (1527) 3GPP (10415)
+type AVP_Unsigned32 TWAN_Connection_Mode;
+
+// 5.2.3.26
+// AVP: TWAN-Connectivity-Parameters (1528) 3GPP (10415)
+type AVP_Grouped TWAN_Connectivity_Parameters;
+
+// 5.2.3.27
+// AVP: Connectivity-Flags (1529) 3GPP (10415)
+type AVP_Unsigned32 Connectivity_Flags;
+
+// 5.2.3.28
+// AVP: TWAN-PCO (1530) 3GPP (10415)
+type AVP_Grouped TWAN_PCO;
+
+// 5.2.3.29
+// AVP: TWAG-CP-Address (1531) 3GPP (10415)
+type AVP_Address TWAG_CP_Address;
+
+// 5.2.3.30
+// AVP: TWAG-UP-Address  (1532) 3GPP (10415)
+type AVP_UTF8String TWAG_UP_Address;
+
+// 5.2.3.31
+// AVP: TWAN-S2a-Failure-Cause (1533) 3GPP (10415)
+type AVP_Unsigned32 TWAN_S2a_Failure_Cause;
+
+// 5.2.3.33
+// AVP: SM-Back-Off-Timer (1534) 3GPP (10415)
+type AVP_Unsigned32 SM_Back_Off_Timer;
+
+// 5.2.3.33
+// AVP: WLCP-Key (1535) 3GPP (10415)
+type AVP_OctetString WLCP_Key;
+
+// 9.2.3.2.6
+// AVP: Origination-Time-Stamp (1536) 3GPP (10415)
+type AVP_Unsigned64 Origination_Time_Stamp;
+
+// 9.2.3.2.7
+// AVP: Maximum-Wait-Time (1537) 3GPP (10415)
+type AVP_Unsigned32 Maximum_Wait_Time;
+
+// 7.2.3.5
+// AVP: Emergency-Services (1538) 3GPP (10415)
+type AVP_Unsigned32 Emergency_Services;
+
+// 7.2.3.5
+// AVP: AAR-Flags (1539) 3GPP (10415)
+type AVP_Unsigned32 AAR_Flags;
+
+// 5.2.3.35
+// AVP: IMEI-Check-In-VPLMN-Result (1540) 3GPP (10415)
+type AVP_Unsigned32 IMEI_Check_In_VPLMN_Result;
+
+// 8.2.3.27
+// AVP: ERP-Authorization (1541) 3GPP (10415)
+type AVP_Unsigned32 ERP_Authorization;
+
+
diff --git a/src/AVP.awk b/src/AVP.awk
old mode 100644
new mode 100755
diff --git a/src/AVP.sh b/src/AVP.sh
old mode 100644
new mode 100755
index 877a74a48a794d2e49bdf39a429feb04e6a1dfa4..6744c922d8b80777847042e7d755036b3a751791
--- a/src/AVP.sh
+++ b/src/AVP.sh
@@ -145,7 +145,12 @@ while [ $# -ge 1 ]; do
      comm_name=`which $0`
      comm_dir_name=`dirname $comm_name`
      if [ -f "${comm_dir_name}/${AVPSCRIPT}" ]; then
-       echo "// Generated with command:" > ${TTCN3FILE}".ttcn"
+       echo "///////////////////////////////////////////////////" > ${TTCN3FILE}".ttcn"
+       echo "//                                               //" >> ${TTCN3FILE}".ttcn"
+       echo "// !!!!     Generated file, do not edit     !!!! //" >> ${TTCN3FILE}".ttcn"
+       echo "//                                               //" >> ${TTCN3FILE}".ttcn"
+       echo "///////////////////////////////////////////////////" >> ${TTCN3FILE}".ttcn"
+       echo "// Generated with command:" >> ${TTCN3FILE}".ttcn"
        echo "// AVP.sh ${AWKARGS}"  >> ${TTCN3FILE}".ttcn"
        gawk -f ${comm_dir_name}/${AVPSCRIPT} ${AWKARGS} >> ${TTCN3FILE}".ttcn"
      else
diff --git a/src/AVP_encdec.awk b/src/AVP_encdec.awk
index 45bdd4118d02e8ea05070e814f19ed0d21194a3a..08335946498345febabfbf88de58967d7de30bc6 100644
--- a/src/AVP_encdec.awk
+++ b/src/AVP_encdec.awk
@@ -78,9 +78,8 @@ BEGIN {
   } 
 
 
-  print "int encode_AVP_Grouped(unsigned char* & p, const AVP__Grouped& avp){" 
-  print "  int avp_len=0;"
-  print "  unsigned char* start =p;"
+  print "int encode_AVP_Grouped(TTCN_Buffer & p, const AVP__Grouped& avp){" 
+  print "   size_t start_len =p.get_len();"
   print " 	for (int count = 0; count < avp.size_of(); count++) {"
   print "    switch(avp[count].get_selection()){"
   print "      case GenericAVP::ALT_avp__undefined:{"
@@ -107,20 +106,9 @@ BEGIN {
   print "          const AVP& avptype=avp[count].avp();"
   print "          const AVP__Header& avphdr=avptype.avp__header();"
 	        
-  print "          encode_int_4byte(p, get_AVP_code_val(avphdr.avp__code()));"
-  print "#ifdef DPMG_USE_DETAILED_BITS"
-  print "          encode_bits_1byte(p, avphdr.V__bit(), avphdr.M__bit(), avphdr.P__bit(),"
-  print "	 		                         avphdr.r__bits());"
-  print "#else"
-  print "          encode_octets(p, bit2oct(avphdr.VMPxxxxx()));"
-  print "#endif "         
-  print "          unsigned char* length_field=p;"
-  print "          p+=3;"
-  print "          if (avphdr.vendor__id().ispresent()){"
-  print "             encode_int_4byte(p, avphdr.vendor__id()());"
-  print "          }"
           
   print "          int encoded_octets=0;"
+  print "          TTCN_Buffer avp_buffer;"
   print "          switch(avptype.avp__data().get_selection()){"
 
 
@@ -182,20 +170,20 @@ BEGIN {
    if($2 == "enumerated") {
       if(enum_2_Unsigned32 || ((new_avp_code SP new_avp_vendor_id_code) in enum_replace_list)) {
         AVP_type[new_avp_code SP new_avp_vendor_id_code] = "AVP_Unsigned32"
-        BUFFER = "(p, "
+        BUFFER = "(avp_buffer, "
         TYPE = "AVP_Unsigned32"
         printCaseCommand(BUFFER, TYPE)
 
       } else {
         AVP_type[new_avp_code SP new_avp_vendor_id_code] = "enumerated"
-        BUFFER = "(p,(int)"
+        BUFFER = "(avp_buffer,(int)"
         TYPE = "AVP_enumerated"
         printCaseCommand(BUFFER, TYPE)
       }
       next
     } else {
         AVP_type[new_avp_code SP new_avp_vendor_id_code] = $2
-        BUFFER = "(p,"
+        BUFFER = "(avp_buffer,"
         TYPE = $2
         printCaseCommand(BUFFER, TYPE)
     }
@@ -206,9 +194,19 @@ END {
   print "            default:"
   print "              break;"
   print "          }"
-  print "          int avphdr_size = 8 + 4 * (avphdr.vendor__id().ispresent());"
-  print "          avp_len=avphdr_size+encoded_octets;"
-  print "          encode_int_3byte(length_field, (unsigned int) avp_len);"
+
+  print "          encode_int_4byte(p, get_AVP_code_val(avphdr.avp__code()));"
+  print "#ifdef DPMG_USE_DETAILED_BITS"
+  print "          encode_bits_1byte(p, avphdr.V__bit(), avphdr.M__bit(), avphdr.P__bit(),"
+  print "	 		                         avphdr.r__bits());"
+  print "#else"
+  print "          encode_octets(p, bit2oct(avphdr.VMPxxxxx()));"
+  print "#endif "         
+  print "          encode_int_3byte(p, (unsigned int) (8 + 4 * (avphdr.vendor__id().ispresent())+encoded_octets));"
+  print "          if (avphdr.vendor__id().ispresent()){"
+  print "             encode_int_4byte(p, avphdr.vendor__id()());"
+  print "          }"
+  print "          p.put_buf(avp_buffer);"
   print "   "       
   print "        }"
   print "        break;"
@@ -218,7 +216,7 @@ END {
   print "    }"
   print "	} // for AVPs"
   print " "
-  print "return p-start;" 
+  print "return p.get_len()-start_len;" 
   print "}"
   print ""
   print "int get_AVP_code_val(const AVP__Code& avpcodes){"
diff --git a/src/Acision_Specific.ddf b/src/Acision_Specific.ddf
index 8887e9bea891beb9fd1a2984ed3a7922b69b856c..ff5b915d358911303065f1d04040bd018cc845f4 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 //  Reference:          
 //
diff --git a/src/Alcatel_Lucent_Specific_AVPs.ddf b/src/Alcatel_Lucent_Specific_AVPs.ddf
index f0c9f401f9dd835d6b9ba6a63aa8265d88af2f9a..b9888281710c1043da6c1e5425a62830a7687857 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/BaseTypes_IETF_RFC3588.ddf b/src/BaseTypes_IETF_RFC3588.ddf
index dd0a763c773d9cad419d28e27a76db7b69f22883..5aa628417f24c5ac87c9c5c8a4a67e16bf17fb01 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
@@ -60,7 +60,7 @@ external function f_DIAMETER_GetAVPByListOfCodesFromGroupedAVP(in octetstring pl
 
 function f_get_R_bit(in PDU_DIAMETER pl_pdu) return boolean
 {
-!3   return pl_pdu.RPETxxxx[7]=='1'B;
+!3   return pl_pdu.RPETxxxx[0]=='1'B;
 !4   return pl_pdu.R_bit=='1'B;
 }
 
@@ -169,14 +169,14 @@ type charstring QoSFilterRule;
 // 4.2. Basic AVP Data Formats
 //
 
-type octetstring AVP_OctetString;
-type INT32 AVP_Integer32;
-type INT64 AVP_Integer64;
-type UINT32 AVP_Unsigned32;
-type UINT64 AVP_Unsigned64;
-type FLOAT32 AVP_Float32;
-type FLOAT64 AVP_Float64;
-type AVP_list AVP_Grouped;
+type octetstring AVP_OctetString with {variant ""};
+type INT32 AVP_Integer32 with {variant ""};
+type INT64 AVP_Integer64 with {variant ""};
+type UINT32 AVP_Unsigned32 with {variant ""};
+type UINT64 AVP_Unsigned64 with {variant ""};
+type FLOAT32 AVP_Float32 with {variant ""};
+type FLOAT64 AVP_Float64 with {variant ""};
+type AVP_list AVP_Grouped with {variant ""};
 
 //
 // 4.3. Derived AVP Data Formats
diff --git a/src/Base_IETF_RFC3588.ddf b/src/Base_IETF_RFC3588.ddf
index d367fea3f156a11a98b568cd87f0c5ccfc835f26..bba3fcb527581f8ff4c20c4c2e037b63c38353d6 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
@@ -49,7 +49,7 @@
 //
 
 // RFC 3588 3.1
-type enumerated Command_Code 
+type enumerated Command_Code
 {
   Abort_Session         (274),
   Accounting            (271),
@@ -59,15 +59,15 @@ type enumerated Command_Code
   Re_Auth               (258),
   Session_Termination   (275)
 }
-   
 
 
-// RFC 3588 
+
+// RFC 3588
 // AVP: Acct-Interim-Interval (85)
 // 9.8.2
 type AVP_Unsigned32 Acct_Interim_Interval;
 
-// RFC 3588 
+// RFC 3588
 // AVP: Accounting-Realtime-Required (483)
 // 9.8.7
 type enumerated Accounting_Realtime_Required
@@ -75,19 +75,19 @@ type enumerated Accounting_Realtime_Required
   DELIVER_AND_GRANT (1),
   GRANT_AND_STORE   (2),
   GRANT_AND_LOSE    (3)
-} 
+}
 
-// RFC 3588 
+// RFC 3588
 // AVP: Acct-Multi-Session-Id (50)
 // 9.8.5
 type AVP_UTF8String Acct_Multi_Session_Id;
 
-// RFC 3588 
+// RFC 3588
 // AVP: Accounting-Record-Number (485)
 // 9.8.3
 type AVP_Unsigned32 Accounting_Record_Number;
 
-// RFC 3588 
+// RFC 3588
 // AVP: Accounting-Record-Type (480)
 // 9.8.1
 type enumerated Accounting_Record_Type
@@ -98,28 +98,28 @@ type enumerated Accounting_Record_Type
   STOP_RECORD                    (4)
 }
 
-// RFC 3588 
+// RFC 3588
 // AVP: Accounting-Session-Id (44)
 // 9.8.4
 type AVP_OctetString Accounting_Session_Id;
 
-// RFC 3588 
+// RFC 3588
 // AVP: Accounting-Sub-Session-Id (287)
 // 9.8.6
 type AVP_Unsigned64 Accounting_Sub_Session_Id;
 
-// RFC 3588 
+// RFC 3588
 // AVP: Acct-Application-Id (259)
 // 6.9
 type AVP_Unsigned32 Acct_Application_Id;
 
-// RFC 3588 
+// RFC 3588
 // AVP: Auth-Application-Id (258)
 // 6.8
 type AVP_Unsigned32 Auth_Application_Id;
 
-// RFC 3588 
-// AVP: Auth-Request-Type (274) 
+// RFC 3588
+// AVP: Auth-Request-Type (274)
 // 8.7
 type enumerated Auth_Request_Type
 {
@@ -128,17 +128,17 @@ type enumerated Auth_Request_Type
   AUTHORIZE_AUTHENTICATE    (3)
 }
 
-// RFC 3588 
+// RFC 3588
 // AVP: Authorization-Lifetime (291)
 // 8.9
 type AVP_Unsigned32 Authorization_Lifetime;
 
-// RFC 3588 
+// RFC 3588
 // AVP: Auth-Grace-Period (276)
 // 8.10
 type AVP_Unsigned32 Auth_Grace_Period;
-     
-// RFC 3588 
+
+// RFC 3588
 // AVP: Auth-Session-State (277)
 // 8.11
 type enumerated Auth_Session_State
@@ -147,8 +147,8 @@ type enumerated Auth_Session_State
   NO_STATE_MAINTAINED      (1)
 }
 
-// RFC 3588 
-// AVP: Re-Auth-Request-Type (285) 
+// RFC 3588
+// AVP: Re-Auth-Request-Type (285)
 // 8.12
 type enumerated Re_Auth_Request_Type
 {
@@ -156,22 +156,22 @@ type enumerated Re_Auth_Request_Type
   AUTHORIZE_AUTHENTICATE (1)
 }
 
-// RFC 3588 
+// RFC 3588
 // AVP: Class (25)
 // 8.20
 type AVP_OctetString Class;
 
-// RFC 3588 
+// RFC 3588
 // AVP: Destination-Host (293)
 // 6.5
 type AVP_DiameterIdentity Destination_Host;
 
-// RFC 3588 
+// RFC 3588
 // AVP: Destination-Realm (283)
 // 6.6
 type AVP_DiameterIdentity Destination_Realm;
 
-// RFC 3588 
+// RFC 3588
 // AVP: Disconnect-Cause (273)
 // 5.4.3
 type enumerated Disconnect_Cause
@@ -181,102 +181,102 @@ type enumerated Disconnect_Cause
   DO_NOT_WANT_TO_TALK_TO_YOU (2)
 }
 
-// RFC 3588 
+// RFC 3588
 // AVP: E2E-Sequence (300)
 // 6.15
 type AVP_Grouped E2E_Sequence;
 
-// RFC 3588 
+// RFC 3588
 // AVP: Error-Message (281)
 // 7.3
 type AVP_UTF8String Error_Message;
 
-// RFC 3588 
-// AVP: Error-Reporting-Host (294) 
+// RFC 3588
+// AVP: Error-Reporting-Host (294)
 // 7.4
 type AVP_DiameterIdentity Error_Reporting_Host;
 
-// RFC 3588 
+// RFC 3588
 // AVP: Event-Timestamp (55)
 // 8.21
 type AVP_Time Event_Timestamp;
 
-// RFC 3588 
+// RFC 3588
 // AVP: Experimental-Result (297)
 // 7.6
 type AVP_Grouped Experimental_Result;
 
-// RFC 3588 
+// RFC 3588
 // AVP: Experimental-Result-Code (298)
 // 7.7
 type AVP_Unsigned32 Experimental_Result_Code;
 
-// RFC 3588 
+// RFC 3588
 // AVP: Failed-AVP (279)
 // 7.5
 type AVP_Grouped Failed_AVP;
 
-// RFC 3588 
+// RFC 3588
 // AVP: Firmware-Revision (267)
 // 5.3.4
 type AVP_Unsigned32 Firmware_Revision;
 
-// RFC 3588 
+// RFC 3588
 // AVP: Host-IP-Address (257)
 // 5.3.5
 type AVP_Address Host_IP_Address;
 
-// RFC 3588 
+// RFC 3588
 // AVP: Inband-Security-Id (299)
 // 6.10
 type AVP_Unsigned32 Inband_Security_Id;
 
-// RFC 3588 
+// RFC 3588
 // AVP: Multi-Round-Time-Out (272)
 // 8.19
 type AVP_Unsigned32 Multi_Round_Time_Out;
 
-// RFC 3588 
+// RFC 3588
 // AVP: Origin-Host (264)
 // 6.3
 type AVP_DiameterIdentity Origin_Host;
 
-// RFC 3588 
+// RFC 3588
 // AVP: Origin-Realm (296)
 // 6.4
 type AVP_DiameterIdentity Origin_Realm;
 
-// RFC 3588 
+// RFC 3588
 // AVP: Origin-State-Id (278)
 // 8.16
 type AVP_Unsigned32 Origin_State_Id;
 
-// RFC 3588 
+// RFC 3588
 // AVP: Product-Name (269)
 // 5.3.7
 type AVP_UTF8String Product_Name;
 
-// RFC 3588 
+// RFC 3588
 // AVP: Proxy-Host (280)
 // 6.7.3
 type AVP_DiameterIdentity Proxy_Host;
 
-// RFC 3588 
+// RFC 3588
 // AVP: Proxy-Info (284)
 // 6.7.2
 type AVP_Grouped Proxy_Info;
 
-// RFC 3588 
+// RFC 3588
 // AVP: Proxy-State (33)
 // 6.7.4
 type AVP_OctetString Proxy_State;
 
-// RFC 3588 
+// RFC 3588
 // AVP: Redirect-Host (292)
 // 6.12
 type AVP_DiameterURI Redirect_Host;
 
-// RFC 3588 
+// RFC 3588
 // AVP: Redirect-Host-Usage (261)
 // 6.13
 type enumerated Redirect_Host_Usage
@@ -290,37 +290,37 @@ type enumerated Redirect_Host_Usage
   ALL_USER              (6)
 }
 
-// RFC 3588 
+// RFC 3588
 // AVP: Redirect-Max-Cache-Time (262)
 // 6.14
 type AVP_Unsigned32 Redirect_Max_Cache_Time;
 
-// RFC 3588 
+// RFC 3588
 // AVP: Result-Code (268)
 // 7.1
 type AVP_Unsigned32 Result_Code;
 
-// RFC 3588 
+// RFC 3588
 // AVP: Route-Record (282)
 // 6.7.1
 type AVP_DiameterIdentity Route_Record;
 
-// RFC 3588 
+// RFC 3588
 // AVP: Session-Id (263)
 // 8.8
 type AVP_UTF8String Session_Id;
 
-// RFC 3588 
+// RFC 3588
 // AVP: Session-Timeout (27)
 // 8.13
 type AVP_Unsigned32 Session_Timeout;
 
-// RFC 3588 
+// RFC 3588
 // AVP: Session-Binding (270)
 // 8.17
 type AVP_Unsigned32 Session_Binding;
 
-// RFC 3588 
+// RFC 3588
 // AVP: Session-Server-Failover (271)
 // 8.18
 type enumerated Session_Server_Failover
@@ -331,12 +331,12 @@ type enumerated Session_Server_Failover
   TRY_AGAIN_ALLOW_SERVICE        (3)
 }
 
-// RFC 3588 
+// RFC 3588
 // AVP: Supported-Vendor-Id (265)
 // 5.3.6
 type AVP_Unsigned32 Supported_Vendor_Id;
 
-// RFC 3588 
+// RFC 3588
 // AVP: Termination-Cause (295)
 // 8.15
 type enumerated Termination_Cause
@@ -351,17 +351,17 @@ type enumerated Termination_Cause
   DIAMETER_SESSION_TIMEOUT       (8)
 }
 
-// RFC 3588 
+// RFC 3588
 // AVP: User-Name (1)
 // 8.14
-type AVP_UTF8String User_Name;			
+type AVP_UTF8String User_Name;
 
-// RFC 3588 
+// RFC 3588
 // AVP: Vendor-Id (266)
 // 5.3.3
 type AVP_Unsigned32 Vendor_Id;
 
-// RFC 3588 
+// RFC 3588
 // AVP: Vendor-Specific-Application-Id (260)
 // 6.11
 type AVP_Grouped Vendor_Specific_Application_Id;
diff --git a/src/CLCInterface_Vodafone_Rev2.ddf b/src/CLCInterface_Vodafone_Rev2.ddf
index 650e20b016ffbfdbaa51d169e58a577b1d5ffd9c..99662a25f26a1bedc260ba2a1e68a7be54f0f648 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/ChargingApplications_3GPP_TS32299_850.ddf b/src/ChargingApplications_3GPP_TS32299_850.ddf
index 3e2db612ede8a81651a9ca17fe956d1cf29ad1ac..341bff9e672aead8d5fe415b0e0b61c2d4fe6502 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/ChargingApplications_3GPP_TS32299_870.ddf b/src/ChargingApplications_3GPP_TS32299_870.ddf
index 5ca0966eea3195b52d4d3906d0900157de1a60c0..02e46ce043e1101c658494a1c82e7bc7a65eff95 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/ChargingApplications_3GPP_TS32299_900.ddf b/src/ChargingApplications_3GPP_TS32299_900.ddf
index e56d38f311eb4bd64a0086a5cd287216c14eee52..779687a6c867f08576a0d25073962fcdb5bde544 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/ChargingApplications_3GPP_TS32299_940.ddf b/src/ChargingApplications_3GPP_TS32299_940.ddf
index 16439d1ab167240d099c52e3f638261d961f1fd6..f00db1bed8d8fb79c93b1036016f12d7b12dea74 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/ChargingApplications_3GPP_TS32299_9b0.ddf b/src/ChargingApplications_3GPP_TS32299_9b0.ddf
index 02b16a612ad03d2177efff1bac5869f906bb6a19..d9c06d2a1cf33fda4af451bc41a8e4d61031bfdf 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/ChargingApplications_3GPP_TS32299_AdviceOfCharge.ddf b/src/ChargingApplications_3GPP_TS32299_AdviceOfCharge.ddf
index 1670d2238452785ee46bb33a0c0424238e95fdf0..cc6f793f30ac183fd2590aebb8654fa407f86f1b 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/ChargingApplications_3GPP_TS32299_a60.ddf b/src/ChargingApplications_3GPP_TS32299_a60.ddf
index 9953ae6a1cd79b1ec10cc3a1ce9907796cd29cfa..5d0d99730e3377ab3c9686656fbd9ffd06037180 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/ChargingApplications_3GPP_TS32299_be0.ddf b/src/ChargingApplications_3GPP_TS32299_be0.ddf
index 3994569a23ff1b6c67cce621f9a5678043de4085..d37256de982d308c8d27090d7badd4d29b4d6797 100644
--- a/src/ChargingApplications_3GPP_TS32299_be0.ddf
+++ b/src/ChargingApplications_3GPP_TS32299_be0.ddf
@@ -11,7 +11,7 @@
 //
 //  File:               ChargingApplications_3GPP_TS32299_be0.ddf
 //  Description:        DDF for Diameter Charging Application 3GPP TS 32.299 11.15.0
-//  Rev:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/ChargingApplications_3GPP_TS32299_c60.ddf b/src/ChargingApplications_3GPP_TS32299_c60.ddf
index bbb7b7042f87aa6daba0c40e24ae67a50c28fed6..4221e4db58c042e4993591646bef6fa1c71b3f17 100644
--- a/src/ChargingApplications_3GPP_TS32299_c60.ddf
+++ b/src/ChargingApplications_3GPP_TS32299_c60.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               ChargingApplications_3GPP_TS32299_a60.ddf
 //  Description:        DDF for Diameter Charging Application 3GPP TS 32.299 V12.6.0
-//  Rev:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/ChargingApplications_3GPP_TS32299_d40.ddf b/src/ChargingApplications_3GPP_TS32299_d40.ddf
index 2207a8025cbf5fddf33c4943349a55f66294a8ef..c1df493490e165d8d657004428871b73278283c1 100644
--- a/src/ChargingApplications_3GPP_TS32299_d40.ddf
+++ b/src/ChargingApplications_3GPP_TS32299_d40.ddf
@@ -11,7 +11,7 @@
 //
 //  File:               ChargingApplications_3GPP_TS32299_a60.ddf
 //  Description:        DDF for Diameter Charging Application 3GPP TS 32.299 V13.4.0
-//  Rev:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/ChargingApplications_3GPP_TS32299_d70.ddf b/src/ChargingApplications_3GPP_TS32299_d70.ddf
new file mode 100644
index 0000000000000000000000000000000000000000..ee2fcf3438c3c2ff8ba1e0f5d67eb9b0b69bf2a1
--- /dev/null
+++ b/src/ChargingApplications_3GPP_TS32299_d70.ddf
@@ -0,0 +1,2457 @@
+/******************************************************************************
+* Copyright (c) 2004, 2016  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
+*   Gabor Szalai
+******************************************************************************/
+//
+//  File:               ChargingApplications_3GPP_TS32299_a60.ddf
+//  Description:        DDF for Diameter Charging Application 3GPP TS 32.299 V13.7.0
+//  Rev:                R55A
+//  Prodnr:             CNL 113 462
+///////////////////////////////////////////////
+
+
+// APPLICATION-NAME: DCA
+// APPLICATION-REVISION: V13_7_0
+
+// AVP implementations according to: 
+// 3GPP TS 32.299 V13.7.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 V13.7.0 
+type enumerated Command_Code 
+{  
+  Accounting     (271),
+  Re_Auth        (258)
+}
+
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Access-Network-Information (1263) 3GPP (10415)
+// 7.2.1
+type AVP_OctetString Access_Network_Information;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Access-Transfer-Information (2709) 3GPP (10415)
+// 7.2.1A
+type AVP_Grouped Access_Transfer_Information;
+
+// 3GPP TS 32.299 V13.7.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),
+  PS_to_PS_Transfer (2),
+  CS_to_CS_Transfer (3)
+}
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Account-Expiration  (2309) 3GPP (10415)
+// 7.2.2
+type AVP_Time Account_Expiration;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Accumulated-Cost (2052) 3GPP (10415)
+// 7.2.3
+type AVP_Grouped Accumulated_Cost;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Adaptations (1217) 3GPP (10415)
+// 7.2.4
+type enumerated Adaptations
+{
+  YES (0),
+  NO  (1)
+}
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Additional-Content-Information (1207) 3GPP (10415)
+// 7.2.5
+type AVP_Grouped Additional_Content_Information;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Additional-Exception-Reports  (3936) 3GPP (10415)
+// 7.2.5A
+type enumerated Additional_Exception_Reports
+{
+  NOT_ALLOWED (0),
+  ALLOWED  (1)
+}
+
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Additional-Type-Information (1205) 3GPP (10415)
+// 7.2.6
+type AVP_UTF8String Additional_Type_Information;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Address-Data (897) 3GPP (10415)
+// 7.2.7
+type AVP_UTF8String Address_Data;
+		
+// 3GPP TS 32.299 V13.7.0
+// AVP: Address-Domain (898) 3GPP (10415)
+// 7.2.8
+type AVP_Grouped Address_Domain;
+
+// 3GPP TS 32.299 V13.7.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 V13.7.0
+// AVP: Addressee-Type (1208) 3GPP (10415)
+// 7.2.10
+type enumerated Addressee_Type
+{
+  TO  (0),
+  CC  (1),
+  BCC (2)
+}
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: AF-Correlation-Information (1276) 3GPP (10415)
+// 7.2.11
+type AVP_Grouped AF_Correlation_Information;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Alternate-Charged-Party-Address (1280) 3GPP (10415)
+// 7.2.12
+type AVP_UTF8String Alternate_Charged_Party_Address;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Announcement-Identifier (3905) 3GPP (10415)
+// 7.2.12aA
+type AVP_Unsigned32 Announcement_Identifier;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Announcement-Information (3904) 3GPP (10415)
+// 7.2.12aB
+type AVP_Grouped Announcement_Information;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Announcement-Order (3906) 3GPP (10415)
+// 7.2.12aC
+type AVP_Unsigned32 Announcement_Order;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Announcing-UE-HPLMN-Identifier (3426) 3GPP (10415)
+// 7.2.12A
+type AVP_UTF8String Announcing_UE_HPLMN_Identifier;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Announcing-UE-VPLMN-Identifier (3427) 3GPP (10415)
+// 7.2.12B
+type AVP_UTF8String Announcing_UE_VPLMN_Identifier;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: AoC-Cost-Information (2053) 3GPP (10415)
+// 7.2.13
+type AVP_Grouped AoC_Cost_Information;
+
+// 3GPP TS 32.299 V13.7.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 V13.7.0
+// AVP: AoC-Information (2054) 3GPP (10415)
+// 7.2.15
+type AVP_Grouped AoC_Information;
+
+// 3GPP TS 32.299 V13.7.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 V13.7.0
+// AVP: AoC-Service (2311) 3GPP (10415)
+// 7.2.17
+type AVP_Grouped AoC_Service;
+
+// 3GPP TS 32.299 V13.7.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 V13.7.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 V13.7.0
+// AVP: AoC-Subscription-Information (2314) 3GPP (10415)
+// 7.2.20
+type AVP_Grouped AoC_Subscription_Information;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: APN-Rate-Control (3933) 3GPP (10415)
+// 7.2.20A
+type AVP_Grouped APN_Rate_Control;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: APN-Rate-Control-Downlink (3934) 3GPP (10415)
+// 7.2.20B
+type AVP_Grouped APN_Rate_Control_Downlink;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: APN-Rate-Control-Uplink (3935) 3GPP (10415)
+// 7.2.20B
+type AVP_Grouped APN_Rate_Control_Uplink;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Applic-ID (1218) 3GPP (10415)
+// 7.2.21
+type AVP_UTF8String Applic_ID;
+
+// 3GPP TS 32.299 V13.7.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 V13.7.0
+// AVP: Application-Server (836) 3GPP (10415)
+// 7.2.23
+type AVP_UTF8String Application_Server;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Application-Server-Information (850) 3GPP (10415)
+// 7.2.24
+type AVP_Grouped Application_Server_Information;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Application-Specific-Data (3458) 3GPP (10415)
+// 7.2.24A
+type AVP_OctetString Application_Specific_Data;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Associated-Party-Address (2035) 3GPP (10415)
+// 7.2.25
+type AVP_UTF8String Associated_Party_Address;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Associated-URI (856) 3GPP (10415)
+// 7.2.26
+type AVP_UTF8String Associated_URI;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Authorised-QoS (849) 3GPP (10415)
+// 7.2.27
+type AVP_UTF8String Authorised_QoS;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Aux-Applic-Info (1219) 3GPP (10415)
+// 7.2.28
+type AVP_UTF8String Aux_Applic_Info;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Base-Time-Interval (1265) 3GPP (10415)
+// 7.2.29
+type AVP_Unsigned32 Base_Time_Interval;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Basic-Service-Code (3411) 3GPP (10415)
+// 7.2.29A
+type AVP_Grouped Basic_Service_Code;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Bearer-Capability (3412) 3GPP (10415)
+// 7.2.29B
+type AVP_OctetString Bearer_Capability;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Bearer-Service (854) 3GPP (10415)
+// 7.2.30
+type AVP_OctetString Bearer_Service;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: BSSID (2716) 3GPP (10415)
+// 7.2.30A
+type AVP_UTF8String BSSID;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Called-Asserted-Identity (1250) 3GPP (10415)
+// 7.2.31
+type AVP_UTF8String Called_Asserted_Identity;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Called-Identity (3916) 3GPP (10415)
+// 7.2.31A
+type AVP_UTF8String Called_Identity;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Called-Identity-Change (3917) 3GPP (10415)
+// 7.2.31B
+type AVP_Grouped Called_Identity_Change;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Called-Party-Address (832) 3GPP (10415)
+// 7.2.32
+type AVP_UTF8String Called_Party_Address;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Calling-Party-Address (831) 3GPP (10415)
+// 7.2.33
+type AVP_UTF8String Calling_Party_Address;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Carrier-Select-Routing-Information (2023) 3GPP (10415)
+// 7.2.34
+type AVP_UTF8String Carrier_Select_Routing_Information;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Cause-Code (861) 3GPP (10415)
+// 7.2.35
+type AVP_Integer32 Cause_Code;
+		
+// 3GPP TS 32.299 V13.7.0
+// AVP: CG-Address (846) 3GPP (10415)
+// 7.2.36
+type AVP_Address CG_Address;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Change-Condition  (2037) 3GPP (10415)
+// 7.2.37
+type AVP_Integer32 Change_Condition;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Change-Time  (2038) 3GPP (10415)
+// 7.2.38
+type AVP_Time Change_Time;
+
+// 3GPP TS 32.299 V13.7.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 V13.7.0
+// AVP: Charged-Party (857) 3GPP (10415)
+// 7.2.39
+type AVP_UTF8String Charged_Party;
+
+// 3GPP TS 32.299 V13.7.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 V13.7.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 V13.7.0
+// AVP: Client-Address (2018) 3GPP (10415)
+// 7.2.41
+type AVP_Address Client_Address;
+
+// 3GPP TS 32.299 V13.7.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 V13.7.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 V13.7.0
+// AVP: Content-Disposition (828) 3GPP (10415)
+// 7.2.43
+type AVP_UTF8String Content_Disposition;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Content-Length (827) 3GPP (10415)
+// 7.2.44
+type AVP_Unsigned32 Content_Length;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Content-Size (1206) 3GPP (10415)
+// 7.2.45
+type AVP_Unsigned32 Content_Size;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Content-Type (826) 3GPP (10415)
+// 7.2.46
+type AVP_UTF8String Content_Type;
+		
+// 3GPP TS 32.299 V13.7.0
+// AVP: Coverage-Status (3428) 3GPP (10415)
+// 7.2.46aA
+type enumerated Coverage_Status
+{
+  OUT_OF_COVERAGE (0),
+  IN_COVERAGE (1)
+}
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Coverage-Info (3459) 3GPP (10415)
+// 7.2.46aaA
+type AVP_Grouped Coverage_Info;
+		
+// 3GPP TS 32.299 V13.7.0
+// AVP: CP-CIoT-EPS-Optimisation-Indicator (3930) 3GPP (10415)
+// 7.2.46abA
+type enumerated CP_CIoT_EPS_Optimisation_Indicator
+{
+  NOT_APPLY (0),
+  APPLY (1)
+}
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: CPDT-Information (3927) 3GPP (10415)
+// 7.2.46acA
+type AVP_Grouped CPDT_Information;
+		
+// 3GPP TS 32.299 V13.7.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 V13.7.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 V13.7.0
+// AVP: Current-Tariff (2056) 3GPP (10415)
+// 7.2.47
+type AVP_Grouped Current_Tariff;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: CUG-Information (2304) 3GPP (10415)
+// 7.2.48
+type AVP_OctetString CUG_Information;
+		
+// 3GPP TS 32.299 V13.7.0
+// AVP: Data-Coding-Scheme (2001) 3GPP (10415)
+// 7.2.49
+type AVP_Integer32 Data_Coding_Scheme;		
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: DCD-Information (2115) 3GPP (10415)
+// 7.2.50
+type AVP_Grouped DCD_Information;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Deferred-Location-Event-Type (1230) 3GPP (10415)
+// 7.2.51
+type AVP_UTF8String Deferred_Location_Event_Type;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Delivery-Report-Requested (1216) 3GPP (10415)
+// 7.2.52
+type enumerated Delivery_Report_Requested
+{
+  NO  (0),
+  YES (1)
+}
+		
+// 3GPP TS 32.299 V13.7.0
+// AVP: Destination-Interface (2002) 3GPP (10415)
+// 7.2.53
+type AVP_Grouped Destination_Interface;		
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Diagnostics (2039) 3GPP (10415)
+// 7.2.54
+type AVP_Integer32 Diagnostics;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Domain-Name (1200) 3GPP (10415)
+// 7.2.55
+type AVP_UTF8String Domain_Name;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: DRM-Content (1221) 3GPP (10415)
+// 7.2.56
+type enumerated DRM_Content
+{
+  NO  (0),
+  YES (1)
+}
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Dynamic-Address-Flag (2051) 3GPP (10415)
+// 7.2.57
+type enumerated Dynamic_Address_Flag
+{
+  STATIC    (0),
+  DYNAMIC   (1)
+}
+
+// 3GPP TS 32.299 V13.7.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 V13.7.0
+// AVP: Early-Media-Description (1272) 3GPP (10415)
+// 7.2.58
+type AVP_Grouped Early_Media_Description;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Enhanced-Diagnostics (3901) 3GPP (10415)
+// 7.2.58A
+type AVP_Grouped Enhanced_Diagnostics;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Envelope (1266) 3GPP (10415)
+// 7.2.59
+type AVP_Grouped Envelope;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Envelope-End-Time (1267) 3GPP (10415)
+// 7.2.60
+type AVP_Time Envelope_End_Time;
+
+// 3GPP TS 32.299 V13.7.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 V13.7.0
+// AVP: Envelope-Start-Time (1269) 3GPP (10415)
+// 7.2.62
+type AVP_Time Envelope_Start_Time;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: ePDG-Address (3425) 3GPP (10415)
+// 7.2.62A
+type AVP_Address ePDG_Address;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Event (825) 3GPP (10415)
+// 7.2.63
+type AVP_UTF8String Event;
+		
+// 3GPP TS 32.299 V13.7.0
+// AVP: Event-Charging-TimeStamp (1258) 3GPP (10415)
+// 7.2.64
+type AVP_Time Event_Charging_TimeStamp;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Event-Type (823) 3GPP (10415)
+// 7.2.65
+type AVP_Grouped Event_Type;
+		
+// 3GPP TS 32.299 V13.7.0
+// AVP: Expires (888) 3GPP (10415)
+// 7.2.66
+type AVP_Unsigned32 Expires;
+
+// 3GPP TS 32.299 V13.7.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 V13.7.0
+// AVP: From-Address (2708) 3GPP (10415)
+// 7.2.67A
+type AVP_UTF8String From_Address;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Forwarding-Pending (3415) 3GPP (10415)
+// 7.2.67aA
+type enumerated Forwarding_Pending
+{
+  Forwarding_not_Pending (0),
+  Forwarding_Pending (1)
+}
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: GGSN-Address (847) 3GPP (10415)
+// 7.2.68
+type AVP_Address GGSN_Address;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: IM-Information (2110) 3GPP (10415)
+// 7.2.69
+type AVP_Grouped IM_Information;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Incremental-Cost (2062) 3GPP (10415)
+// 7.2.70
+type AVP_Grouped Incremental_Cost;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Instance-Id (3402) 3GPP (10415)
+// 7.2.70A
+type AVP_UTF8String Instance_Id;
+		
+// 3GPP TS 32.299 V13.7.0
+// AVP: Interface-Id (2003) 3GPP (10415)
+// 7.2.71
+type AVP_UTF8String Interface_Id;		
+		
+// 3GPP TS 32.299 V13.7.0
+// AVP: Interface-Port (2004) 3GPP (10415)
+// 7.2.72
+type AVP_UTF8String Interface_Port;		
+		
+// 3GPP TS 32.299 V13.7.0
+// AVP: Interface-Text (2005) 3GPP (10415)
+// 7.2.73
+type AVP_UTF8String Interface_Text;		
+		
+// 3GPP TS 32.299 V13.7.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 V13.7.0
+// AVP: IMS-Application-Reference-Identifier (2601) 3GPP (10415)
+// 7.2.74A
+type AVP_UTF8String IMS_Application_Reference_Identifier;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Inter-UE-Transfer (3902) 3GPP (10415)
+// 7.2.74aA
+type enumerated Inter_UE_Transfer	
+{
+  INTRA_UE_TRANSFER (0),
+  INTER_UE_TRANSFER (1)
+}
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: IMS-Charging-Identifier (841) 3GPP (10415)
+// 7.2.75
+type AVP_UTF8String IMS_Charging_Identifier;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: IMS-Communication-Service-Identifier (1281) 3GPP (10415)
+// 7.2.76
+type AVP_UTF8String IMS_Communication_Service_Identifier;		
+
+// 3GPP TS 32.299 V13.7.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 V13.7.0
+// AVP: IMS-Information (876) 3GPP (10415)
+// 7.2.77
+type AVP_Grouped IMS_Information;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: IMS-Visited-Network-Identifier (2713) 3GPP (10415)
+// 7.2.77A
+type AVP_UTF8String IMS_Visited_Network_Identifier;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: IMSI-Unauthenticated-Flag (2308) 3GPP (10415)
+// 7.2.78
+type enumerated IMSI_Unauthenticated_Flag	
+{
+  AUTHENTICATED    (0),
+  UNAUTHENTICATED  (1)
+}
+	
+// 3GPP TS 32.299 V13.7.0
+// AVP: Incoming-Trunk-Group-Id (852) 3GPP (10415)
+// 7.2.79
+type AVP_UTF8String Incoming_Trunk_Group_Id;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Initial-IMS-Charging-Identifier (2321) 3GPP (10415)
+// 7.2.79A
+type AVP_UTF8String Initial_IMS_Charging_Identifier;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Inter-Operator-Identifier (838) 3GPP (10415)
+// 7.2.80
+type AVP_Grouped Inter_Operator_Identifier;
+
+// 3GPP TS 32.299 V13.7.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 V13.7.0
+// AVP: ISUP-Cause (3416) 3GPP (10415)
+// 7.2.80B
+type AVP_Grouped ISUP_Cause;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: ISUP-Cause-Diagnostics (3422) 3GPP (10415)
+// 7.2.80C
+type AVP_OctetString ISUP_Cause_Diagnostics;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: ISUP-Cause-Location (3423) 3GPP (10415)
+// 7.2.80D
+type AVP_Unsigned32 ISUP_Cause_Location;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: ISUP-Cause-Value (3424) 3GPP (10415)
+// 7.2.80E
+type AVP_Unsigned32 ISUP_Cause_Value;	
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: ISUP-Location-Number (3414) 3GPP (10415)
+// 7.2.80F
+type AVP_OctetString ISUP_Location_Number;	
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Language (3914) 3GPP (10415)
+// 7.2.80Fa
+type AVP_UTF8String Language;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Layer-2-Group-ID (3429) 3GPP (10415)
+// 7.2.80G
+type AVP_OctetString Layer_2_Group_ID;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: LCS-APN (1231) 3GPP (10415)
+// 7.2.81
+type AVP_UTF8String LCS_APN;
+
+// 3GPP TS 32.299 V13.7.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 V13.7.0
+// AVP: LCS-Client-External-ID (1234) 3GPP (10415)
+// 7.2.83
+type AVP_UTF8String LCS_Client_External_ID;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: LCS-Client-Id (1232) 3GPP (10415)
+// 7.2.84
+type AVP_Grouped LCS_Client_Id;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: LCS-Client-Name (1235) 3GPP (10415)
+// 7.2.85
+type AVP_Grouped LCS_Client_Name;
+
+// 3GPP TS 32.299 V13.7.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 V13.7.0
+// AVP: LCS-Data-Coding-Scheme (1236) 3GPP (10415)
+// 7.2.87
+type AVP_UTF8String LCS_Data_Coding_Scheme;		
+		
+// 3GPP TS 32.299 V13.7.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 V13.7.0
+// AVP: LCS-Information (878) 3GPP (10415)
+// 7.2.89
+type AVP_Grouped LCS_Information;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: LCS-Name-String (1238) 3GPP (10415)
+// 7.2.90
+type AVP_UTF8String LCS_Name_String;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: LCS-Requestor-Id (1239) 3GPP (10415)
+// 7.2.91
+type AVP_Grouped LCS_Requestor_Id;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: LCS-Requestor-Id-String (1240) 3GPP (10415)
+// 7.2.92
+type AVP_UTF8String LCS_Requestor_Id_String;
+
+
+// 3GPP TS 32.299 V13.7.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 V13.7.0
+// AVP: Local-Sequence-Number (2063) 3GPP (10415)
+// 7.2.93
+type AVP_Unsigned32 Local_Sequence_Number;
+
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Location-Estimate (1242) 3GPP (10415)
+// 7.2.94
+type AVP_OctetString Location_Estimate;
+
+// 3GPP TS 32.299 V13.7.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 V13.7.0
+// AVP: Location-Info (3460) 3GPP (10415)
+// 7.2.95A
+type AVP_Grouped Location_Info;
+	
+// 3GPP TS 32.299 V13.7.0
+// AVP: Location-Type (1244) 3GPP (10415)
+// 7.2.96
+type AVP_Grouped Location_Type;
+	
+// 3GPP TS 32.299 V13.7.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 V13.7.0
+// AVP: Low-Priority-Indicator (2602) 3GPP (10415)
+// 7.2.97A
+type enumerated Low_Priority_Indicator
+{
+  NO  (0),
+  YES (1)
+}
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: MBMS-Charged-Party (2323) 3GPP (10415)
+// 7.2.97B
+type enumerated MBMS_Charged_Party
+{
+  CONTENT_PROVIDER  (0),
+  SUBSCRIBER (1)
+}
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: MBMS-GW-Address (2307) 3GPP (10415)
+// 7.2.98
+type AVP_Address MBMS_GW_Address;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: MBMS-Information (880) 3GPP (10415)
+// 7.2.99
+type AVP_Grouped MBMS_Information;		
+
+// 3GPP TS 32.299 V13.7.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 V13.7.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 V13.7.0
+// AVP: Media-Initiator-Party (1288) 3GPP (10415)
+// 7.2.102
+type AVP_UTF8String Media_Initiator_Party;		
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Message-Body (889) 3GPP (10415)
+// 7.2.103
+type AVP_Grouped Message_Body;
+	
+// 3GPP TS 32.299 V13.7.0
+// AVP: Message-Class (1213) 3GPP (10415)
+// 7.2.104
+type AVP_Grouped Message_Class;		
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Message-ID (1210) 3GPP (10415)
+// 7.2.105
+type AVP_UTF8String Message_ID;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Message-Size (1212) 3GPP (10415)
+// 7.2.106
+type AVP_Unsigned32 Message_Size;	 	
+
+// 3GPP TS 32.299 V13.7.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 V13.7.0
+// AVP: MM-Content-Type (1203) 3GPP (10415)
+// 7.2.108
+type AVP_Grouped MM_Content_Type;
+
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: MMBox-Storage-Requested (1248) 3GPP (10415)
+// 7.2.109
+type enumerated MMBox_Storage_Requested
+{
+  NO  (0),
+  YES (1)
+}
+// 3GPP TS 32.299 V13.7.0
+// AVP: MMS-Information (877) 3GPP (10415)
+// 7.2.110
+type AVP_Grouped MMS_Information;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: MMTel-Information (2030) 3GPP (10415)
+// 7.2.111
+type AVP_Grouped MMTel_Information;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: MMTel-SService-Type (2031) 3GPP (10415)
+// 7.2.111A
+type AVP_Unsigned32 MMTel_SService_Type;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Monitored-PLMN-Identifier (3430) 3GPP (10415)
+// 7.2.111Aa
+type AVP_UTF8String Monitored_PLMN_Identifier;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Monitoring-Event-Configuration-Activity (3919) 3GPP (10415)
+// 7.2.111AaA
+type enumerated Monitoring_Event_Configuration_Activity
+{
+  CREATE (0),
+  TRANSFER (1),
+  UPDATE (2),
+  DELETE (3)
+}
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Monitoring-Event-Funtionality (3922) 3GPP (10415)
+// 7.2.111AaB
+type enumerated Monitoring_Event_Funtionality
+{
+  CONFIGURATION (0),
+  REPORTING (1)
+}
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Monitoring-Event-Information (3921) 3GPP (10415)
+// 7.2.111AaC
+type AVP_Grouped Monitoring_Event_Information;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Monitoring-Event-Report-Data (3920) 3GPP (10415)
+// 7.2.111AaD
+type AVP_Grouped Monitoring_Event_Report_Data;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Monitoring-Event-Report-Number (3923) 3GPP (10415)
+// 7.2.111AaE
+type AVP_Unsigned32 Monitoring_Event_Report_Number;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Monitoring-UE-HPLMN-Identifier (3431) 3GPP (10415)
+// 7.2.111Ab
+type AVP_UTF8String Monitoring_UE_HPLMN_Identifier;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Monitoring-UE-Identifier (3432) 3GPP (10415)
+// 7.2.111Ac
+type AVP_UTF8String Monitoring_UE_Identifier;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Monitoring-UE-VPLMN-Identifier (3433) 3GPP (10415)
+// 7.2.111Ad
+type AVP_UTF8String Monitoring_UE_VPLMN_Identifier;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: MSC-Address (3417) 3GPP (10415)
+// 7.2.111B
+type AVP_OctetString MSC_Address;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: MTC-IWF-Address (3406) 3GPP (10415)
+// 7.2.111C
+type AVP_Address MTC_IWF_Address;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Neighbour-Node-Address (2705) 3GPP (10415)
+// 7.2.111D
+type AVP_Address Neighbour_Node_Address;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Network-Call-Reference-Number (3418) 3GPP (10415)
+// 7.2.111E
+type AVP_OctetString Network_Call_Reference_Number;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Next-Tariff (2057) 3GPP (10415)
+// 7.2.112
+type AVP_Grouped Next_Tariff;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: NNI-Information (2703) 3GPP (10415)
+// 7.2.112A
+type AVP_Grouped NNI_Information;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: NIDD-Submission (3928) 3GPP (10415)
+// 7.2.112aA
+type AVP_Grouped NIDD_Submission;
+
+// 3GPP TS 32.299 V13.7.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 V13.7.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),
+  TDF     (18),
+  TWAG    (19),
+  SCEF    (20),
+  IWK_SCEF (21)
+}
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Node-Id (2064) 3GPP (10415)
+// 7.2.114
+type AVP_UTF8String Node_Id;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Number-Of-Diversions (2034) 3GPP (10415)
+// 7.2.115
+type AVP_Unsigned32 Number_Of_Diversions;
+	
+// 3GPP TS 32.299 V13.7.0
+// AVP: Number-of-Messages-Sent (2019) 3GPP (10415)
+// 7.2.116
+type AVP_Unsigned32 Number_of_Messages_Sent;		
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Number-Of-Participants (885) 3GPP (10415)
+// 7.2.117
+type AVP_Unsigned32 Number_Of_Participants;
+			
+// 3GPP TS 32.299 V13.7.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 V13.7.0
+// AVP: Number-Of-Talk-Bursts (1283) 3GPP (10415)
+// 7.2.119
+type AVP_Unsigned32 Number_Of_Talk_Bursts;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Number-Portability-Routing-Information (2024) 3GPP (10415)
+// 7.2.120
+type AVP_UTF8String Number_Portability_Routing_Information;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Offline-Charging (1278) 3GPP (10415)
+// 7.2.121
+type AVP_Grouped Offline_Charging;
+
+// 3GPP TS 32.299 V13.7.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 V13.7.0
+// AVP: Originating-IOI (839) 3GPP (10415)
+// 7.2.123
+type AVP_UTF8String Originating_IOI;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Originator (864) 3GPP (10415)
+// 7.2.124
+type enumerated Originator
+{
+  CALLING_PARTY	(0),
+  CALLED_PARTY 	(1)
+}
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Originator-Address (886) 3GPP (10415)
+// 7.2.125
+type AVP_Grouped Originator_Address;
+		
+// 3GPP TS 32.299 V13.7.0
+// AVP: Originator-Interface (2009) 3GPP (10415)
+// 7.2.126
+type AVP_Grouped Originator_Interface;		
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Originator-Received-Address (2027) 3GPP (10415)
+// 7.2.127 
+type AVP_Grouped Originator_Received_Address;
+		
+// 3GPP TS 32.299 V13.7.0
+// AVP: Originating-SCCP-Address (2008) 3GPP (10415)
+// 7.2.128
+type AVP_Address Originating_SCCP_Address;		
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Outgoing-Session-Id (2320) 3GPP (10415)
+// 7.2.128A
+type AVP_UTF8String Outgoing_Session_Id;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Outgoing-Trunk-Group-Id (853) 3GPP (10415)
+// 7.2.129
+type AVP_UTF8String Outgoing_Trunk_Group_Id;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Participants-Involved (887) 3GPP (10415)
+// 7.2.130
+type AVP_UTF8String Participants_Involved;	
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Participant-Group (1260) 3GPP (10415)
+// 7.2.131
+type AVP_Grouped Participant_Group;
+
+// 3GPP TS 32.299 V13.7.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 V13.7.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 V13.7.0
+// AVP: PC3-Control-Protocol-Cause (3434) 3GPP (10415)
+// 7.2.135A
+type AVP_Integer32 PC3_Control_Protocol_Cause;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: PC3-EPC-Control-Protocol-Cause (3435) 3GPP (10415)
+// 7.2.135B
+type AVP_Integer32 PC3_EPC_Control_Protocol_Cause;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: PDN-Connection-Charging-ID (2050) 3GPP (10415)
+// 7.2.136
+type AVP_Unsigned32 PDN_Connection_Charging_ID;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: PDP-Address (1227) 3GPP (10415)
+// 7.2.137
+type AVP_Address PDP_Address;		
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: PDP-Address-Prefix-Length (2606) 3GPP (10415)
+// 7.2.137A
+type AVP_Unsigned32 PDP_Address_Prefix_Length;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: PDP-Context-Type (1247) 3GPP (10415)
+// 7.2.138
+type enumerated PDP_Context_Type
+{
+  PRIMARY   (0),
+  SECONDARY (1)
+}
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Play-Alternative (3913) 3GPP (10415)
+// 7.2.138A
+type enumerated Play_Alternative
+{
+  SERVED_PARTY   (0),
+  REMOTE_PARTY (1)
+}
+
+// 3GPP TS 32.299 V13.7.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 V13.7.0
+// AVP: PoC-Change-Time (1262) 3GPP (10415)
+// 7.2.140
+type AVP_Time PoC_Change_Time;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: PoC-Controlling-Address (858) 3GPP (10415)
+// 7.2.141
+type AVP_UTF8String PoC_Controlling_Address;		
+
+// 3GPP TS 32.299 V13.7.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 V13.7.0
+// AVP: PoC-Group-Name (859) 3GPP (10415)
+// 7.2.143
+type AVP_UTF8String PoC_Group_Name;	
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: PoC-Information (879) 3GPP (10415)
+// 7.2.144
+type AVP_Grouped PoC_Information;
+
+// 3GPP TS 32.299 V13.7.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 V13.7.0
+// AVP: PoC-Session-Id (1229) 3GPP (10415)
+// 7.2.146
+type AVP_UTF8String PoC_Session_Id;
+
+// 3GPP TS 32.299 V13.7.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 V13.7.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 V13.7.0
+// AVP: PoC-User-Role (1252) 3GPP (10415)
+// 7.2.149
+type AVP_Grouped PoC_User_Role;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: PoC-User-Role-IDs (1253) 3GPP (10415)
+// 7.2.150
+type AVP_UTF8String PoC_User_Role_IDs;
+
+// 3GPP TS 32.299 V13.7.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 V13.7.0
+// AVP: Positioning-Data (1245) 3GPP (10415)
+// 7.2.152
+type AVP_UTF8String Positioning_Data;		 	
+
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Preferred-AoC-Currency (2315) 3GPP (10415)
+// 7.2.153
+type AVP_Unsigned32 Preferred_AoC_Currency;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Priority (1209) 3GPP (10415)
+// 7.2.154
+type enumerated Priority
+{
+  LOW    (0),
+  NORMAL (1),
+  HIGH   (2)
+}
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Privacy-Indicator (3915) 3GPP (10415)
+// 7.2.154aA
+type enumerated Privacy_Indicator
+{
+  NOT_PRIVATE    (0),
+  PRIVATE (1)
+}
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: ProSe-3rd-Party-Application-ID (3440) 3GPP (10415)
+// 7.2.154A
+type AVP_UTF8String ProSe_3rd_Party_Application_ID;		 	
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: ProSe-Direct-Communication-Reception-Data-Container (3461) 3GPP (10415)
+// 7.2.154Aa
+type AVP_Grouped ProSe_Direct_Communication_Reception_Data_Container;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: ProSe-Direct-Communication-Transmission-Data-Container (3441) 3GPP (10415)
+// 7.2.154B
+type AVP_Grouped ProSe_Direct_Communication_Transmission_Data_Container;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: ProSe-Direct-Discovery-Model (3442) 3GPP (10415)
+// 7.2.154C
+type enumerated ProSe_Direct_Discovery_Model 
+{
+  MODEL_A (0),
+  MODEL_B (1)
+}
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: ProSe-Event-Type (3443) 3GPP (10415)
+// 7.2.154D
+type enumerated ProSe_Event_Type 
+{
+  ANNOUNCING (0),
+  MONITORING (1),
+  MATCH_REPORT (2)
+}
+	
+// 3GPP TS 32.299 V13.7.0
+// AVP: ProSe-Function-IP-Address (3444) 3GPP (10415)
+// 7.2.154E
+type AVP_Address ProSe_Function_IP_Address;		
+	
+// 3GPP TS 32.299 V13.7.0
+// AVP: ProSe-Function-PLMN-Identifier (3457) 3GPP (10415)
+// 7.2.154F
+type AVP_UTF8String ProSe_Function_PLMN_Identifier;		
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: ProSe-Functionality (3445) 3GPP (10415)
+// 7.2.154G
+type enumerated ProSe_Functionality
+{
+  DIRECT_DISCOVERY (0),
+  EPC_LEVEL_DISCOVERY (1),
+  DIRECT_COMMUNICATION (2)
+}
+	
+// 3GPP TS 32.299 V13.7.0
+// AVP: ProSe-Group-IP-Multicast-Address (3446) 3GPP (10415)
+// 7.2.154H
+type AVP_Address ProSe_Group_IP_Multicast_Address;		
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: ProSe-Information (3447) 3GPP (10415)
+// 7.2.154I
+type AVP_Grouped ProSe_Information;
+
+// WARNING: Unsigned32 used instead of enumerated type
+// 3GPP TS 32.299 V13.7.0
+// AVP: ProSe-Range-Class (3448) 3GPP (10415)
+// 7.2.154J
+type AVP_Unsigned32 ProSe_Range_Class;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: ProSe-Reason-For-Cancellation (3449) 3GPP (10415)
+// 7.2.154K
+type enumerated ProSe_Reason_For_Cancellation
+{
+  PROXIMITY_ALERT_SENT (0),
+  TIME_EXPIRED_WITH_NO_RENEWAL (1),
+  REQUESTOR_CANCELLATION (2)
+}
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: ProSe-Request-Timestamp (3450) 3GPP (10415)
+// 7.2.154L
+type AVP_Time ProSe_Request_Timestamp;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: ProSe-Role-Of-UE (3451) 3GPP (10415)
+// 7.2.154M
+type enumerated ProSe_Role_Of_UE
+{
+  ANNOUNCING_UE (0),
+  MONITORING_UE (1),
+  REQUESTOR_UE (2),
+  REQUESTED_UE (3)
+}
+	
+// 3GPP TS 32.299 V13.7.0
+// AVP: ProSe-Source-IP-Address (3452) 3GPP (10415)
+// 7.2.154N
+type AVP_Address ProSe_Source_IP_Address;		
+	
+// 3GPP TS 32.299 V13.7.0
+// AVP: ProSe-UE-ID (3453) 3GPP (10415)
+// 7.2.154O
+type AVP_OctetString ProSe_UE_ID;		
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Proximity-Alert-Indication (3454) 3GPP (10415)
+// 7.2.154P
+type enumerated Proximity_Alert_Indication
+{
+  ALERT (0),
+  NO_ALERT (1)
+}
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Proximity-Alert-Timestamp (3455) 3GPP (10415)
+// 7.2.154Q
+type AVP_Time Proximity_Alert_Timestamp;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Proximity-Cancellation-Timestamp (3456) 3GPP (10415)
+// 7.2.154R
+type AVP_Time Proximity_Cancellation_Timestamp;
+
+// 3GPP TS 32.299 V13.7.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 V13.7.0
+// AVP: PS-Free-Format-Data (866) 3GPP (10415)
+// 7.2.156
+type AVP_OctetString PS_Free_Format_Data;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: PS-Furnish-Charging-Information (865) 3GPP (10415)
+// 7.2.157
+type AVP_Grouped PS_Furnish_Charging_Information;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: PS-Information (874) 3GPP (10415)
+// 7.2.158
+type AVP_Grouped PS_Information;
+				
+// 3GPP TS 32.299 V13.7.0
+// AVP: Quota-Consumption-Time (881) 3GPP (10415)
+// 7.2.159
+type AVP_Unsigned32 Quota_Consumption_Time;		
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Quota-Holding-Time (871) 3GPP (10415)
+// 7.2.160
+type AVP_Unsigned32 Quota_Holding_Time;
+		
+// 3GPP TS 32.299 V13.7.0
+// AVP: Quota-Indicator (3912) 3GPP (10415)
+// 7.2.160aA
+type enumerated Quota_Indicator
+{
+  QUOTA_IS_NOT_USED_DURING_PLAYBACK (0),
+  QUOTA_IS_USED_DURING_PLAYBACK (1)
+}
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Radio-Frequency (3462) 3GPP (10415)
+// 7.2.160A
+type AVP_OctetString Radio_Frequency;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Radio-Parameter-Set-Info (3463) 3GPP (10415)
+// 7.2.160B
+type AVP_Grouped Radio_Parameter_Set_Info;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Radio-Parameter-Set-Values (3464) 3GPP (10415)
+// 7.2.160C
+type AVP_OctetString Radio_Parameter_Set_Values;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Radio-Resources-Indicator (3465) 3GPP (10415)
+// 7.2.160D
+type AVP_Integer32 Radio_Resources_Indicator;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Rate-Control-Max-Message-Size (3937) 3GPP (10415)
+// 7.2.160E
+type AVP_Integer32 Rate_Control_Max_Message_Size;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Rate-Control-Max-Rate (3938) 3GPP (10415)
+// 7.2.160F
+type AVP_Integer32 Rate_Control_Max_Rate;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Rate-Control-Time-Unit (3939) 3GPP (10415)
+// 7.2.160G
+type AVP_Integer32 Rate_Control_Time_Unit;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Rate-Element (2058) 3GPP (10415)
+// 7.2.161
+type AVP_Grouped Rate_Element;
+		
+// 3GPP TS 32.299 V13.7.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 V13.7.0
+// AVP: Real-Time-Tariff-Information (2305) 3GPP (10415)
+// 7.2.164
+type AVP_Grouped Real_Time_Tariff_Information;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Reason-Header (3401) 3GPP (10415)
+// 7.2.164A
+type AVP_UTF8String Reason_Header;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Received-Talk-Burst-Time (1284) 3GPP (10415)
+// 7.2.165
+type AVP_Unsigned32 Received_Talk_Burst_Time;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Received-Talk-Burst-Volume (1285) 3GPP (10415)
+// 7.2.166
+type AVP_Unsigned32 Received_Talk_Burst_Volume;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Recipient-Address (1201) 3GPP (10415)
+// 7.2.167
+type AVP_Grouped Recipient_Address;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Recipient-Info (2026) 3GPP (10415)
+// 7.2.168
+type AVP_Grouped Recipient_Info;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Recipient-Received-Address (2028) 3GPP (10415)
+// 7.2.169
+type AVP_Grouped Recipient_Received_Address;
+	
+// 3GPP TS 32.299 V13.7.0
+// AVP: Recipient-SCCP-Address (2010) 3GPP (10415)
+// 7.2.170
+type AVP_Address Recipient_SCCP_Address;		
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Refund-Information (2022) 3GPP (10415)
+// 7.2.171
+type AVP_OctetString Refund_Information;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Relationship-Mode (2706) 3GPP (10415)
+// 7.2.171A
+type enumerated Relationship_Mode
+{
+  Trusted (0),
+  Non_Trusted (1)
+}
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Related-Change-Condition-Information (3925) 3GPP (10415)
+// 7.2.171Aa
+type AVP_Grouped Related_Change_Condition_Information;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Related-Trigger (3926) 3GPP (10415)
+// 7.2.171Ab
+type AVP_Grouped Related_Trigger;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Related-IMS-Charging-Identifier (2711) 3GPP (10415)
+// 7.2.171B
+type AVP_UTF8String Related_IMS_Charging_Identifier;
+
+// 3GPP TS 32.299 V13.7.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 V13.7.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 V13.7.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 V13.7.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 V13.7.0
+// AVP: Requested-Party-Address (1251) 3GPP (10415)
+// 7.2.176
+type AVP_UTF8String Requested_Party_Address;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Requested-PLMN-Identifier (3436) 3GPP (10415)
+// 7.2.176A
+type AVP_UTF8String Requested_PLMN_Identifier;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Requestor-PLMN-Identifier (3437) 3GPP (10415)
+// 7.2.176B
+type AVP_UTF8String Requestor_PLMN_Identifier;
+
+// 3GPP TS 32.299 V13.7.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),
+  FORWARDING_ROLE   (2)
+}
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Role-Of-ProSe-Function (3438) 3GPP (10415)
+// 7.2.177aA
+type enumerated Role_Of_ProSe_Function
+{
+  HPLMN  (0),
+  VPLMN  (1),
+  LOCAL_PLMN (2)
+}
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Route-Header-Received (3403) 3GPP (10415)
+// 7.2.177A
+type AVP_UTF8String Route_Header_Received;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Route-Header-Transmitted (3404) 3GPP (10415)
+// 7.2.177B
+type AVP_UTF8String Route_Header_Transmitted;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Scale-Factor (2059) 3GPP (10415)
+// 7.2.178
+type AVP_Grouped Scale_Factor;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: SDP-Answer-Timestamp (1275) 3GPP (10415)
+// 7.2.179
+type AVP_Time SDP_Answer_Timestamp;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: SDP-Media-Component (843) 3GPP (10415)
+// 7.2.180
+type AVP_Grouped SDP_Media_Component;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: SDP-Media-Description (845) 3GPP (10415)
+// 7.2.181
+type AVP_UTF8String SDP_Media_Description;		
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: SDP-Media-Name (844) 3GPP (10415)
+// 7.2.182
+type AVP_UTF8String SDP_Media_Name;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: SDP-Offer-Timestamp (1274) 3GPP (10415)
+// 7.2.183
+type AVP_Time SDP_Offer_Timestamp;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: SDP-Session-Description (842) 3GPP (10415)
+// 7.2.184
+type AVP_UTF8String SDP_Session_Description;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: SDP-TimeStamps (1273) 3GPP (10415)
+// 7.2.185
+type AVP_Grouped SDP_TimeStamps;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: SDP-Type (2036) 3GPP (10415)
+// 7.2.186
+type enumerated SDP_Type
+{
+  SDP_OFFER  (0),
+  SDP_ANSWER (1)
+}
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Session-Direction	(2707) 3GPP (10415)
+// 7.2.186A
+type enumerated Session_Direction
+{
+  Inbound (0),
+  Outbound (1)
+}
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Served-Party-IP-Address	(848) 3GPP (10415)
+// 7.2.187
+type AVP_Address Served_Party_IP_Address;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Service-Data-Container (2040) 3GPP (10415)
+// 7.2.189
+type AVP_Grouped Service_Data_Container;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Service-Id (855) 3GPP (10415)
+// 7.2.190
+type AVP_UTF8String Service_Id;
+	
+// 3GPP TS 32.299 V13.7.0
+// AVP: Service-Generic-Information (1256) 3GPP (10415)
+// 7.2.191
+type AVP_Grouped Service_Generic_Information;	 			
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Service-Information (873) 3GPP (10415)
+// 7.2.192
+type AVP_Grouped Service_Information;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Service-Mode (2032) 3GPP (10415)
+// 7.2.193
+type AVP_Unsigned32 Service_Mode;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Service-Specific-Data (863) 3GPP (10415)
+// 7.2.194
+type AVP_UTF8String Service_Specific_Data;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Service-Specific-Info (1249) 3GPP (10415)
+// 7.2.195
+type AVP_Grouped Service_Specific_Info;
+		
+// 3GPP TS 32.299 V13.7.0
+// AVP: Service-Specific-Type (1257) 3GPP (10415)
+// 7.2.196
+type AVP_Unsigned32 Service_Specific_Type;
+		
+// 3GPP TS 32.299 V13.7.0
+// AVP: Serving-Node-Identity (3929) 3GPP (10415)
+// 7.2.197A
+type AVP_DiameterIdentity Serving_Node_Identity;
+
+// 3GPP TS 32.299 V13.7.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),
+  TWAN      (6)
+}
+
+// 3GPP TS 32.299 V13.7.0
+// AVP:  SGi-PtP-Tunnelling-Method (3931) 3GPP (10415)
+// 7.2.198A
+type enumerated SGi_PtP_Tunnelling_Method
+{
+  UDP_IP_BASED      (0),
+  Others            (1)
+}
+		
+// 3GPP TS 32.299 V13.7.0
+// AVP: SGSN-Address (1228) 3GPP (10415)
+// 7.2.199
+type AVP_Address SGSN_Address;
+
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: SGW-Address (2067) 3GPP (10415)
+// 7.2.199A
+type AVP_Address SGW_Address;
+
+// 3GPP TS 32.299 V13.7.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 V13.7.0
+// AVP: SIP-Method (824) 3GPP (10415)
+// 7.2.201
+type AVP_UTF8String SIP_Method;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: SIP-Request-Timestamp (834) 3GPP (10415)
+// 7.2.202
+type AVP_Time SIP_Request_Timestamp;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: SIP-Request-Timestamp-Fraction (2301) 3GPP (10415)
+// 7.2.203
+type AVP_Unsigned32 SIP_Request_Timestamp_Fraction;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: SIP-Response-Timestamp (835) 3GPP (10415)
+// 7.2.204
+type AVP_Time SIP_Response_Timestamp;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: SIP-Response-Timestamp-Fraction (2302) 3GPP (10415)
+// 7.2.205
+type AVP_Unsigned32 SIP_Response_Timestamp_Fraction;
+
+// 3GPP TS 32.299 V13.7.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 V13.7.0
+// AVP: SM-Device-Trigger-Information (3405) 3GPP (10415)
+// 7.2.205B
+type AVP_Grouped SM_Device_Trigger_Information;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: SM-Discharge-Time (2012) 3GPP (10415)
+// 7.2.206
+type AVP_Time SM_Discharge_Time;		
+		
+// 3GPP TS 32.299 V13.7.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 V13.7.0
+// AVP: SM-Protocol-ID (2013) 3GPP (10415)
+// 7.2.208
+type AVP_OctetString SM_Protocol_ID;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: SM-Sequence-Number (3408) 3GPP (10415)
+// 7.2.208A
+type AVP_Unsigned32 SM_Sequence_Number;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: SM-Status (2014) 3GPP (10415)
+// 7.2.209
+type AVP_OctetString SM_Status;		
+	
+// 3GPP TS 32.299 V13.7.0
+// AVP: SM-User-Data-Header (2015) 3GPP (10415)
+// 7.2.210
+type AVP_OctetString SM_User_Data_Header;		
+	
+// 3GPP TS 32.299 V13.7.0
+// AVP: SMS-Information (2000) 3GPP (10415)
+// 7.2.211
+type AVP_Grouped SMS_Information;		
+	
+// 3GPP TS 32.299 V13.7.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 V13.7.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 V13.7.0
+// AVP: SM-Service-Type (2029) 3GPP (10415)
+// 7.2.213
+type AVP_Unsigned32 SM_Service_Type;
+	
+// 3GPP TS 32.299 V13.7.0
+// AVP: SMSC-Address (2017) 3GPP (10415)
+// 7.2.214
+type AVP_Address SMSC_Address;	
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Start-Of-Charging (3419) 3GPP (10415)
+// 7.2.214A
+type AVP_Time Start_Of_Charging;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Start-Time (2041) 3GPP (10415)
+// 7.2.215
+type AVP_Time Start_Time;
+
+// 3GPP TS 32.299 V13.7.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 V13.7.0
+// AVP: Stop-Time (2042) 3GPP (10415)
+// 7.2.216
+type AVP_Time Stop_Time;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Submission-Time (1202) 3GPP (10415)
+// 7.2.217
+type AVP_Time Submission_Time;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Subscriber-Role (2033) 3GPP (10415)
+// 7.2.218
+type enumerated Subscriber_Role
+{
+  ORIGINATING (0),
+  TERMINATING (1)
+}
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Supplementary-Service (2048) 3GPP (10415)
+// 7.2.219
+type AVP_Grouped Supplementary_Service;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: TAD-Identifier (2717) 3GPP (10415)
+// 7.2.219A
+type enumerated TAD_Identifier
+{
+  CS (0),
+  PS (1)
+}
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Talk-Burst-Exchange (1255) 3GPP (10415)
+// 7.2.220
+type AVP_Grouped Talk_Burst_Exchange;	 	
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Talk-Burst-Time (1286) 3GPP (10415)
+// 7.2.221
+type AVP_Unsigned32 Talk_Burst_Time;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Talk-Burst-Volume (1287) 3GPP (10415)
+// 7.2.222
+type AVP_Unsigned32 Talk_Burst_Volume;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Tariff-Information (2060) 3GPP (10415)
+// 7.2.223
+type AVP_Grouped Tariff_Information;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Tariff-XML (2306) 3GPP (10415)
+// 7.2.224
+type AVP_UTF8String Tariff_XML;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Teleservice (3413) 3GPP (10415)
+// 7.2.224A
+type AVP_OctetString Teleservice;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Terminating-IOI (840) 3GPP (10415)
+// 7.2.225
+type AVP_UTF8String Terminating_IOI;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Time-First-Reception (3466) 3GPP (10415)
+// 7.2.225A
+type AVP_Time Time_First_Reception;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Time-First-Transmission (3467) 3GPP (10415)
+// 7.2.225B
+type AVP_Time Time_First_Transmission;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Time-First-Usage (2043) 3GPP (10415)
+// 7.2.226
+type AVP_Time Time_First_Usage;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Time-Indicator (3911) 3GPP (10415)
+// 7.2.226A
+type AVP_Unsigned32 Time_Indicator;		
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Time-Last-Usage (2044) 3GPP (10415)
+// 7.2.227
+type AVP_Time Time_Last_Usage;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Time-Quota-Mechanism (1270) 3GPP (10415)
+// 7.2.228
+type AVP_Grouped Time_Quota_Mechanism;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Time-Quota-Threshold (868) 3GPP (10415)
+// 7.2.229
+type AVP_Unsigned32 Time_Quota_Threshold;		
+
+// 3GPP TS 32.299 V13.7.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 V13.7.0
+// AVP: Time-Stamps (833) 3GPP (10415)
+// 7.2.231
+type AVP_Grouped Time_Stamps;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Time-Usage (2045) 3GPP (10415)
+// 7.2.232
+type AVP_Unsigned32 Time_Usage;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Traffic-Data-Volumes (2046) 3GPP (10415)
+// 7.2.233
+type AVP_Grouped Traffic_Data_Volumes;
+
+// 3GPP TS 32.299 V13.7.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 V13.7.0
+// AVP: Transit-IOI-List (2701) 3GPP (10415)
+// 7.2.233B
+type AVP_UTF8String Transit_IOI_List;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Transmitter-Info (3468) 3GPP (10415)
+// 7.2.233C
+type AVP_Grouped Transmitter_Info;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Token-Text (1215) 3GPP (10415)
+// 7.2.234
+type AVP_UTF8String Token_Text;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Trigger (1264) 3GPP (10415)
+// 7.2.235
+type AVP_Grouped Trigger;
+
+// 3GPP TS 32.299 V13.7.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),
+  CHANGEINQOS_APN_AGGREGATE_MAXIMUM_BIT_RATE   (24),
+  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_ACCESS_FOR_A_SERVICE_DATA_FLOW     (62),
+  CHANGE_IN_USER_CSG_INFORMATION               (70),
+  CHANGE_IN_HYBRID_SUBSCRIBED_USER_CSG_INFORMATION (71),
+  CHANGE_IN_HYBRID_UNSUBSCRIBED_USER_CSG_INFORMATION (72),
+  CHANGE_OF_UE_PRESENCE_IN_PRESENCE_REPORTING_AREA (73),
+  CHANGE_IN_SERVING_PLMN_RATE_CONTROL          (74),
+  CHANGE_IN_APN_RATE_CONTROL                   (75)
+}
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Trunk-Group-Id (851) 3GPP (10415)
+// 7.2.237
+type AVP_Grouped Trunk_Group_Id;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: TWAG-Address (3903) 3GPP (10415)
+// 7.2.237Ba
+type AVP_Address TWAG_Address;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: TWAN-User-Location-Info (2714) 3GPP (10415)
+// 7.2.237C
+type AVP_Grouped TWAN_User_Location_Info;
+
+// WARNING: Unsigned32 used instead of enumerated type
+// 3GPP TS 32.299 V13.7.0
+// AVP: Type-Number (1204) 3GPP (10415)
+// 7.2.238
+type AVP_Unsigned32 Type_Number;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: UNI-PDU-CP-Only-Flag (3932) 3GPP (10415)
+// 7.2.238A
+type enumerated UNI_PDU_CP_Only_Flag
+{
+  UNI_PDU_both_UP_CP     (0),
+  UNI_PDU_CP_Only        (1)
+}
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Unit-Cost (2061) 3GPP (10415)
+// 7.2.239
+type AVP_Grouped Unit_Cost;
+		
+// 3GPP TS 32.299 V13.7.0
+// AVP: Unit-Quota-Threshold (1226) 3GPP (10415)
+// 7.2.240
+type AVP_Unsigned32 Unit_Quota_Threshold;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: User-CSG-Information (2319) 3GPP (10415)
+// 7.2.240A
+type AVP_Grouped User_CSG_Information;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Usage-Information-Report-Sequence-Number (3439) 3GPP (10415)
+// 7.2.240B
+type AVP_Integer32 Usage_Information_Report_Sequence_Number;
+
+// 3GPP TS 32.299 V13.7.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 V13.7.0
+// AVP: User-Session-Id (830) 3GPP (10415)
+// 7.2.242
+type AVP_UTF8String User_Session_Id;
+
+// 3GPP TS 32.299 V13.7.0 CR0716
+// AVP: UWAN-User-Location-Info (3918) 3GPP (10415)
+// 7.2.242aaA
+type AVP_Grouped UWAN_User_Location_Info;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Variable-Part (3907) 3GPP (10415)
+// 7.2.242aA
+type AVP_Grouped Variable_Part;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Variable-Part-Order (3908) 3GPP (10415)
+// 7.2.242aB
+type AVP_Unsigned32 Variable_Part_Order;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Variable-Part-Type (3909) 3GPP (10415)
+// 7.2.242aC
+type AVP_Unsigned32 Variable_Part_Type;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: Variable-Part-Value (3910) 3GPP (10415)
+// 7.2.242aD
+type AVP_UTF8String Variable_Part_Value;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: VCS-Information (3410) 3GPP (10415)
+// 7.2.242A
+type AVP_Grouped VCS_Information;
+
+// 3GPP TS 32.299 V13.7.0
+// AVP: VLR-Number (3420) 3GPP (10415)
+// 7.2.242B
+type AVP_OctetString VLR_Number;
+		
+// 3GPP TS 32.299 V13.7.0
+// AVP: Volume-Quota-Threshold (869) 3GPP (10415)
+// 7.2.243
+type AVP_Unsigned32 Volume_Quota_Threshold;
+
+
diff --git a/src/ChargingApplications_3GPP_TS32299_d90.ddf b/src/ChargingApplications_3GPP_TS32299_d90.ddf
new file mode 100644
index 0000000000000000000000000000000000000000..a3e759f9f160a510e1438d8605fcf931b2cf406d
--- /dev/null
+++ b/src/ChargingApplications_3GPP_TS32299_d90.ddf
@@ -0,0 +1,2473 @@
+/******************************************************************************
+* Copyright (c) 2004, 2017  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:
+*   Akos Makovics - initial implementation and initial documentation
+*   Gabor Szalai
+*   Timea Moder
+******************************************************************************/
+//
+//  File:               ChargingApplications_3GPP_TS32299_d90.ddf
+//  Description:        DDF for Diameter Charging Application 3GPP TS 32.299 V13.9.0
+//  Rev:                R55A
+//  Prodnr:             CNL 113 462
+///////////////////////////////////////////////
+
+
+// APPLICATION-NAME: DCA
+// APPLICATION-REVISION: V13_9_0
+
+// AVP implementations according to:
+// 3GPP TS 32.299 V13.9.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 V13.9.0
+type enumerated Command_Code
+{
+  Accounting     (271),
+  Re_Auth        (258)
+}
+
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Access-Network-Information (1263) 3GPP (10415)
+// 7.2.1
+type AVP_OctetString Access_Network_Information;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Access-Transfer-Information (2709) 3GPP (10415)
+// 7.2.1A
+type AVP_Grouped Access_Transfer_Information;
+
+// 3GPP TS 32.299 V13.9.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),
+  PS_to_PS_Transfer (2),
+  CS_to_CS_Transfer (3)
+}
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Account-Expiration  (2309) 3GPP (10415)
+// 7.2.2
+type AVP_Time Account_Expiration;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Accumulated-Cost (2052) 3GPP (10415)
+// 7.2.3
+type AVP_Grouped Accumulated_Cost;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Adaptations (1217) 3GPP (10415)
+// 7.2.4
+type enumerated Adaptations
+{
+  YES (0),
+  NO  (1)
+}
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Additional-Content-Information (1207) 3GPP (10415)
+// 7.2.5
+type AVP_Grouped Additional_Content_Information;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Additional-Exception-Reports  (3936) 3GPP (10415)
+// 7.2.5A
+type enumerated Additional_Exception_Reports
+{
+  NOT_ALLOWED (0),
+  ALLOWED  (1)
+}
+
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Additional-Type-Information (1205) 3GPP (10415)
+// 7.2.6
+type AVP_UTF8String Additional_Type_Information;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Address-Data (897) 3GPP (10415)
+// 7.2.7
+type AVP_UTF8String Address_Data;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Address-Domain (898) 3GPP (10415)
+// 7.2.8
+type AVP_Grouped Address_Domain;
+
+// 3GPP TS 32.299 V13.9.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 V13.9.0
+// AVP: Addressee-Type (1208) 3GPP (10415)
+// 7.2.10
+type enumerated Addressee_Type
+{
+  TO  (0),
+  CC  (1),
+  BCC (2)
+}
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: AF-Correlation-Information (1276) 3GPP (10415)
+// 7.2.11
+type AVP_Grouped AF_Correlation_Information;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Alternate-Charged-Party-Address (1280) 3GPP (10415)
+// 7.2.12
+type AVP_UTF8String Alternate_Charged_Party_Address;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Announcement-Identifier (3905) 3GPP (10415)
+// 7.2.12aA
+type AVP_Unsigned32 Announcement_Identifier;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Announcement-Information (3904) 3GPP (10415)
+// 7.2.12aB
+type AVP_Grouped Announcement_Information;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Announcement-Order (3906) 3GPP (10415)
+// 7.2.12aC
+type AVP_Unsigned32 Announcement_Order;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Announcing-UE-HPLMN-Identifier (3426) 3GPP (10415)
+// 7.2.12A
+type AVP_UTF8String Announcing_UE_HPLMN_Identifier;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Announcing-UE-VPLMN-Identifier (3427) 3GPP (10415)
+// 7.2.12B
+type AVP_UTF8String Announcing_UE_VPLMN_Identifier;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: AoC-Cost-Information (2053) 3GPP (10415)
+// 7.2.13
+type AVP_Grouped AoC_Cost_Information;
+
+// 3GPP TS 32.299 V13.9.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 V13.9.0
+// AVP: AoC-Information (2054) 3GPP (10415)
+// 7.2.15
+type AVP_Grouped AoC_Information;
+
+// 3GPP TS 32.299 V13.9.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 V13.9.0
+// AVP: AoC-Service (2311) 3GPP (10415)
+// 7.2.17
+type AVP_Grouped AoC_Service;
+
+// 3GPP TS 32.299 V13.9.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 V13.9.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 V13.9.0
+// AVP: AoC-Subscription-Information (2314) 3GPP (10415)
+// 7.2.20
+type AVP_Grouped AoC_Subscription_Information;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: APN-Rate-Control (3933) 3GPP (10415)
+// 7.2.20A
+type AVP_Grouped APN_Rate_Control;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: APN-Rate-Control-Downlink (3934) 3GPP (10415)
+// 7.2.20B
+type AVP_Grouped APN_Rate_Control_Downlink;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: APN-Rate-Control-Uplink (3935) 3GPP (10415)
+// 7.2.20B
+type AVP_Grouped APN_Rate_Control_Uplink;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Applic-ID (1218) 3GPP (10415)
+// 7.2.21
+type AVP_UTF8String Applic_ID;
+
+// 3GPP TS 32.299 V13.9.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 V13.9.0
+// AVP: Application-Server (836) 3GPP (10415)
+// 7.2.23
+type AVP_UTF8String Application_Server;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Application-Server-Information (850) 3GPP (10415)
+// 7.2.24
+type AVP_Grouped Application_Server_Information;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Application-Specific-Data (3458) 3GPP (10415)
+// 7.2.24A
+type AVP_OctetString Application_Specific_Data;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Associated-Party-Address (2035) 3GPP (10415)
+// 7.2.25
+type AVP_UTF8String Associated_Party_Address;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Associated-URI (856) 3GPP (10415)
+// 7.2.26
+type AVP_UTF8String Associated_URI;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Authorised-QoS (849) 3GPP (10415)
+// 7.2.27
+type AVP_UTF8String Authorised_QoS;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Aux-Applic-Info (1219) 3GPP (10415)
+// 7.2.28
+type AVP_UTF8String Aux_Applic_Info;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Base-Time-Interval (1265) 3GPP (10415)
+// 7.2.29
+type AVP_Unsigned32 Base_Time_Interval;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Basic-Service-Code (3411) 3GPP (10415)
+// 7.2.29A
+type AVP_Grouped Basic_Service_Code;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Bearer-Capability (3412) 3GPP (10415)
+// 7.2.29B
+type AVP_OctetString Bearer_Capability;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Bearer-Service (854) 3GPP (10415)
+// 7.2.30
+type AVP_OctetString Bearer_Service;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: BSSID (2716) 3GPP (10415)
+// 7.2.30A
+type AVP_UTF8String BSSID;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Called-Asserted-Identity (1250) 3GPP (10415)
+// 7.2.31
+type AVP_UTF8String Called_Asserted_Identity;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Called-Identity (3916) 3GPP (10415)
+// 7.2.31A
+type AVP_UTF8String Called_Identity;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Called-Identity-Change (3917) 3GPP (10415)
+// 7.2.31B
+type AVP_Grouped Called_Identity_Change;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Called-Party-Address (832) 3GPP (10415)
+// 7.2.32
+type AVP_UTF8String Called_Party_Address;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Calling-Party-Address (831) 3GPP (10415)
+// 7.2.33
+type AVP_UTF8String Calling_Party_Address;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Carrier-Select-Routing-Information (2023) 3GPP (10415)
+// 7.2.34
+type AVP_UTF8String Carrier_Select_Routing_Information;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Cause-Code (861) 3GPP (10415)
+// 7.2.35
+type AVP_Integer32 Cause_Code;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: CG-Address (846) 3GPP (10415)
+// 7.2.36
+type AVP_Address CG_Address;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Change-Condition  (2037) 3GPP (10415)
+// 7.2.37
+type AVP_Integer32 Change_Condition;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Change-Time  (2038) 3GPP (10415)
+// 7.2.38
+type AVP_Time Change_Time;
+
+// 3GPP TS 32.299 V13.9.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 V13.9.0
+// AVP: Charged-Party (857) 3GPP (10415)
+// 7.2.39
+type AVP_UTF8String Charged_Party;
+
+// 3GPP TS 32.299 V13.9.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 V13.9.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 V13.9.0
+// AVP: Client-Address (2018) 3GPP (10415)
+// 7.2.41
+type AVP_Address Client_Address;
+
+// 3GPP TS 32.299 V13.9.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 V13.9.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 V13.9.0
+// AVP: Content-Disposition (828) 3GPP (10415)
+// 7.2.43
+type AVP_UTF8String Content_Disposition;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Content-Length (827) 3GPP (10415)
+// 7.2.44
+type AVP_Unsigned32 Content_Length;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Content-Size (1206) 3GPP (10415)
+// 7.2.45
+type AVP_Unsigned32 Content_Size;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Content-Type (826) 3GPP (10415)
+// 7.2.46
+type AVP_UTF8String Content_Type;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Coverage-Status (3428) 3GPP (10415)
+// 7.2.46aA
+type enumerated Coverage_Status
+{
+  OUT_OF_COVERAGE (0),
+  IN_COVERAGE (1)
+}
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Coverage-Info (3459) 3GPP (10415)
+// 7.2.46aaA
+type AVP_Grouped Coverage_Info;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: CP-CIoT-EPS-Optimisation-Indicator (3930) 3GPP (10415)
+// 7.2.46abA
+type enumerated CP_CIoT_EPS_Optimisation_Indicator
+{
+  NOT_APPLY (0),
+  APPLY (1)
+}
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: CPDT-Information (3927) 3GPP (10415)
+// 7.2.46acA
+type AVP_Grouped CPDT_Information;
+
+// 3GPP TS 32.299 V13.9.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 V13.9.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 V13.9.0
+// AVP: Current-Tariff (2056) 3GPP (10415)
+// 7.2.47
+type AVP_Grouped Current_Tariff;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: CUG-Information (2304) 3GPP (10415)
+// 7.2.48
+type AVP_OctetString CUG_Information;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Data-Coding-Scheme (2001) 3GPP (10415)
+// 7.2.49
+type AVP_Integer32 Data_Coding_Scheme;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: DCD-Information (2115) 3GPP (10415)
+// 7.2.50
+type AVP_Grouped DCD_Information;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Deferred-Location-Event-Type (1230) 3GPP (10415)
+// 7.2.51
+type AVP_UTF8String Deferred_Location_Event_Type;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Delivery-Report-Requested (1216) 3GPP (10415)
+// 7.2.52
+type enumerated Delivery_Report_Requested
+{
+  NO  (0),
+  YES (1)
+}
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Destination-Interface (2002) 3GPP (10415)
+// 7.2.53
+type AVP_Grouped Destination_Interface;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Diagnostics (2039) 3GPP (10415)
+// 7.2.54
+type AVP_Integer32 Diagnostics;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Domain-Name (1200) 3GPP (10415)
+// 7.2.55
+type AVP_UTF8String Domain_Name;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: DRM-Content (1221) 3GPP (10415)
+// 7.2.56
+type enumerated DRM_Content
+{
+  NO  (0),
+  YES (1)
+}
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Dynamic-Address-Flag (2051) 3GPP (10415)
+// 7.2.57
+type enumerated Dynamic_Address_Flag
+{
+  STATIC    (0),
+  DYNAMIC   (1)
+}
+
+// 3GPP TS 32.299 V13.9.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 V13.9.0
+// AVP: Early-Media-Description (1272) 3GPP (10415)
+// 7.2.58
+type AVP_Grouped Early_Media_Description;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Enhanced-Diagnostics (3901) 3GPP (10415)
+// 7.2.58A
+type AVP_Grouped Enhanced_Diagnostics;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Envelope (1266) 3GPP (10415)
+// 7.2.59
+type AVP_Grouped Envelope;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Envelope-End-Time (1267) 3GPP (10415)
+// 7.2.60
+type AVP_Time Envelope_End_Time;
+
+// 3GPP TS 32.299 V13.9.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 V13.9.0
+// AVP: Envelope-Start-Time (1269) 3GPP (10415)
+// 7.2.62
+type AVP_Time Envelope_Start_Time;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: ePDG-Address (3425) 3GPP (10415)
+// 7.2.62A
+type AVP_Address ePDG_Address;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Event (825) 3GPP (10415)
+// 7.2.63
+type AVP_UTF8String Event;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Event-Charging-TimeStamp (1258) 3GPP (10415)
+// 7.2.64
+type AVP_Time Event_Charging_TimeStamp;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Event-Type (823) 3GPP (10415)
+// 7.2.65
+type AVP_Grouped Event_Type;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Expires (888) 3GPP (10415)
+// 7.2.66
+type AVP_Unsigned32 Expires;
+
+// 3GPP TS 32.299 V13.9.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 V13.9.0
+// AVP: From-Address (2708) 3GPP (10415)
+// 7.2.67A
+type AVP_UTF8String From_Address;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Forwarding-Pending (3415) 3GPP (10415)
+// 7.2.67aA
+type enumerated Forwarding_Pending
+{
+  Forwarding_not_Pending (0),
+  Forwarding_Pending (1)
+}
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: GGSN-Address (847) 3GPP (10415)
+// 7.2.68
+type AVP_Address GGSN_Address;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: IM-Information (2110) 3GPP (10415)
+// 7.2.69
+type AVP_Grouped IM_Information;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Incremental-Cost (2062) 3GPP (10415)
+// 7.2.70
+type AVP_Grouped Incremental_Cost;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Instance-Id (3402) 3GPP (10415)
+// 7.2.70A
+type AVP_UTF8String Instance_Id;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Interface-Id (2003) 3GPP (10415)
+// 7.2.71
+type AVP_UTF8String Interface_Id;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Interface-Port (2004) 3GPP (10415)
+// 7.2.72
+type AVP_UTF8String Interface_Port;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Interface-Text (2005) 3GPP (10415)
+// 7.2.73
+type AVP_UTF8String Interface_Text;
+
+// 3GPP TS 32.299 V13.9.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 V13.9.0
+// AVP: IMS-Application-Reference-Identifier (2601) 3GPP (10415)
+// 7.2.74A
+type AVP_UTF8String IMS_Application_Reference_Identifier;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Inter-UE-Transfer (3902) 3GPP (10415)
+// 7.2.74aA
+type enumerated Inter_UE_Transfer
+{
+  INTRA_UE_TRANSFER (0),
+  INTER_UE_TRANSFER (1)
+}
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: IMS-Charging-Identifier (841) 3GPP (10415)
+// 7.2.75
+type AVP_UTF8String IMS_Charging_Identifier;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: IMS-Communication-Service-Identifier (1281) 3GPP (10415)
+// 7.2.76
+type AVP_UTF8String IMS_Communication_Service_Identifier;
+
+// 3GPP TS 32.299 V13.9.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 V13.9.0
+// AVP: IMS-Information (876) 3GPP (10415)
+// 7.2.77
+type AVP_Grouped IMS_Information;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: IMS-Visited-Network-Identifier (2713) 3GPP (10415)
+// 7.2.77A
+type AVP_UTF8String IMS_Visited_Network_Identifier;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: IMSI-Unauthenticated-Flag (2308) 3GPP (10415)
+// 7.2.78
+type enumerated IMSI_Unauthenticated_Flag
+{
+  AUTHENTICATED    (0),
+  UNAUTHENTICATED  (1)
+}
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Incoming-Trunk-Group-Id (852) 3GPP (10415)
+// 7.2.79
+type AVP_UTF8String Incoming_Trunk_Group_Id;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Initial-IMS-Charging-Identifier (2321) 3GPP (10415)
+// 7.2.79A
+type AVP_UTF8String Initial_IMS_Charging_Identifier;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Inter-Operator-Identifier (838) 3GPP (10415)
+// 7.2.80
+type AVP_Grouped Inter_Operator_Identifier;
+
+// 3GPP TS 32.299 V13.9.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 V13.9.0
+// AVP: ISUP-Cause (3416) 3GPP (10415)
+// 7.2.80B
+type AVP_Grouped ISUP_Cause;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: ISUP-Cause-Diagnostics (3422) 3GPP (10415)
+// 7.2.80C
+type AVP_OctetString ISUP_Cause_Diagnostics;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: ISUP-Cause-Location (3423) 3GPP (10415)
+// 7.2.80D
+type AVP_Unsigned32 ISUP_Cause_Location;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: ISUP-Cause-Value (3424) 3GPP (10415)
+// 7.2.80E
+type AVP_Unsigned32 ISUP_Cause_Value;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: ISUP-Location-Number (3414) 3GPP (10415)
+// 7.2.80F
+type AVP_OctetString ISUP_Location_Number;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Language (3914) 3GPP (10415)
+// 7.2.80Fa
+type AVP_UTF8String Language;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Layer-2-Group-ID (3429) 3GPP (10415)
+// 7.2.80G
+type AVP_OctetString Layer_2_Group_ID;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: LCS-APN (1231) 3GPP (10415)
+// 7.2.81
+type AVP_UTF8String LCS_APN;
+
+// 3GPP TS 32.299 V13.9.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 V13.9.0
+// AVP: LCS-Client-External-ID (1234) 3GPP (10415)
+// 7.2.83
+type AVP_UTF8String LCS_Client_External_ID;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: LCS-Client-Id (1232) 3GPP (10415)
+// 7.2.84
+type AVP_Grouped LCS_Client_Id;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: LCS-Client-Name (1235) 3GPP (10415)
+// 7.2.85
+type AVP_Grouped LCS_Client_Name;
+
+// 3GPP TS 32.299 V13.9.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 V13.9.0
+// AVP: LCS-Data-Coding-Scheme (1236) 3GPP (10415)
+// 7.2.87
+type AVP_UTF8String LCS_Data_Coding_Scheme;
+
+// 3GPP TS 32.299 V13.9.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 V13.9.0
+// AVP: LCS-Information (878) 3GPP (10415)
+// 7.2.89
+type AVP_Grouped LCS_Information;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: LCS-Name-String (1238) 3GPP (10415)
+// 7.2.90
+type AVP_UTF8String LCS_Name_String;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: LCS-Requestor-Id (1239) 3GPP (10415)
+// 7.2.91
+type AVP_Grouped LCS_Requestor_Id;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: LCS-Requestor-Id-String (1240) 3GPP (10415)
+// 7.2.92
+type AVP_UTF8String LCS_Requestor_Id_String;
+
+
+// 3GPP TS 32.299 V13.9.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 V13.9.0
+// AVP: Local-Sequence-Number (2063) 3GPP (10415)
+// 7.2.93
+type AVP_Unsigned32 Local_Sequence_Number;
+
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Location-Estimate (1242) 3GPP (10415)
+// 7.2.94
+type AVP_OctetString Location_Estimate;
+
+// 3GPP TS 32.299 V13.9.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 V13.9.0
+// AVP: Location-Info (3460) 3GPP (10415)
+// 7.2.95A
+type AVP_Grouped Location_Info;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Location-Type (1244) 3GPP (10415)
+// 7.2.96
+type AVP_Grouped Location_Type;
+
+// 3GPP TS 32.299 V13.9.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 V13.9.0
+// AVP: Low-Priority-Indicator (2602) 3GPP (10415)
+// 7.2.97A
+type enumerated Low_Priority_Indicator
+{
+  NO  (0),
+  YES (1)
+}
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: MBMS-Charged-Party (2323) 3GPP (10415)
+// 7.2.97B
+type enumerated MBMS_Charged_Party
+{
+  CONTENT_PROVIDER  (0),
+  SUBSCRIBER (1)
+}
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: MBMS-GW-Address (2307) 3GPP (10415)
+// 7.2.98
+type AVP_Address MBMS_GW_Address;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: MBMS-Information (880) 3GPP (10415)
+// 7.2.99
+type AVP_Grouped MBMS_Information;
+
+// 3GPP TS 32.299 V13.9.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 V13.9.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 V13.9.0
+// AVP: Media-Initiator-Party (1288) 3GPP (10415)
+// 7.2.102
+type AVP_UTF8String Media_Initiator_Party;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Message-Body (889) 3GPP (10415)
+// 7.2.103
+type AVP_Grouped Message_Body;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Message-Class (1213) 3GPP (10415)
+// 7.2.104
+type AVP_Grouped Message_Class;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Message-ID (1210) 3GPP (10415)
+// 7.2.105
+type AVP_UTF8String Message_ID;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Message-Size (1212) 3GPP (10415)
+// 7.2.106
+type AVP_Unsigned32 Message_Size;
+
+// 3GPP TS 32.299 V13.9.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 V13.9.0
+// AVP: MM-Content-Type (1203) 3GPP (10415)
+// 7.2.108
+type AVP_Grouped MM_Content_Type;
+
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: MMBox-Storage-Requested (1248) 3GPP (10415)
+// 7.2.109
+type enumerated MMBox_Storage_Requested
+{
+  NO  (0),
+  YES (1)
+}
+// 3GPP TS 32.299 V13.9.0
+// AVP: MMS-Information (877) 3GPP (10415)
+// 7.2.110
+type AVP_Grouped MMS_Information;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: MMTel-Information (2030) 3GPP (10415)
+// 7.2.111
+type AVP_Grouped MMTel_Information;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: MMTel-SService-Type (2031) 3GPP (10415)
+// 7.2.111A
+type AVP_Unsigned32 MMTel_SService_Type;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Monitored-PLMN-Identifier (3430) 3GPP (10415)
+// 7.2.111Aa
+type AVP_UTF8String Monitored_PLMN_Identifier;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Monitoring-Event-Configuration-Activity (3919) 3GPP (10415)
+// 7.2.111AaA
+type enumerated Monitoring_Event_Configuration_Activity
+{
+  CREATE (0),
+  TRANSFER (1),
+  UPDATE (2),
+  DELETE (3)
+}
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Monitoring-Event-Funtionality (3922) 3GPP (10415)
+// 7.2.111AaB
+type enumerated Monitoring_Event_Funtionality
+{
+  CONFIGURATION (0),
+  REPORTING (1)
+}
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Monitoring-Event-Information (3921) 3GPP (10415)
+// 7.2.111AaC
+type AVP_Grouped Monitoring_Event_Information;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Monitoring-Event-Report-Data (3920) 3GPP (10415)
+// 7.2.111AaD
+type AVP_Grouped Monitoring_Event_Report_Data;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Monitoring-Event-Report-Number (3923) 3GPP (10415)
+// 7.2.111AaE
+type AVP_Unsigned32 Monitoring_Event_Report_Number;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Monitoring-UE-HPLMN-Identifier (3431) 3GPP (10415)
+// 7.2.111Ab
+type AVP_UTF8String Monitoring_UE_HPLMN_Identifier;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Monitoring-UE-Identifier (3432) 3GPP (10415)
+// 7.2.111Ac
+type AVP_UTF8String Monitoring_UE_Identifier;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Monitoring-UE-VPLMN-Identifier (3433) 3GPP (10415)
+// 7.2.111Ad
+type AVP_UTF8String Monitoring_UE_VPLMN_Identifier;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: MSC-Address (3417) 3GPP (10415)
+// 7.2.111B
+type AVP_OctetString MSC_Address;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: MTC-IWF-Address (3406) 3GPP (10415)
+// 7.2.111C
+type AVP_Address MTC_IWF_Address;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Neighbour-Node-Address (2705) 3GPP (10415)
+// 7.2.111D
+type AVP_Address Neighbour_Node_Address;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Network-Call-Reference-Number (3418) 3GPP (10415)
+// 7.2.111E
+type AVP_OctetString Network_Call_Reference_Number;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Next-Tariff (2057) 3GPP (10415)
+// 7.2.112
+type AVP_Grouped Next_Tariff;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: NNI-Information (2703) 3GPP (10415)
+// 7.2.112A
+type AVP_Grouped NNI_Information;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: NIDD-Submission (3928) 3GPP (10415)
+// 7.2.112aA
+type AVP_Grouped NIDD_Submission;
+
+// 3GPP TS 32.299 V13.9.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 V13.9.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),
+  TDF     (18),
+  TWAG    (19),
+  SCEF    (20),
+  IWK_SCEF (21)
+}
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Node-Id (2064) 3GPP (10415)
+// 7.2.114
+type AVP_UTF8String Node_Id;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Number-Of-Diversions (2034) 3GPP (10415)
+// 7.2.115
+type AVP_Unsigned32 Number_Of_Diversions;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Number-of-Messages-Sent (2019) 3GPP (10415)
+// 7.2.116
+type AVP_Unsigned32 Number_of_Messages_Sent;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Number-Of-Participants (885) 3GPP (10415)
+// 7.2.117
+type AVP_Unsigned32 Number_Of_Participants;
+
+// 3GPP TS 32.299 V13.9.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 V13.9.0
+// AVP: Number-Of-Talk-Bursts (1283) 3GPP (10415)
+// 7.2.119
+type AVP_Unsigned32 Number_Of_Talk_Bursts;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Number-Portability-Routing-Information (2024) 3GPP (10415)
+// 7.2.120
+type AVP_UTF8String Number_Portability_Routing_Information;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Offline-Charging (1278) 3GPP (10415)
+// 7.2.121
+type AVP_Grouped Offline_Charging;
+
+// 3GPP TS 32.299 V13.9.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 V13.9.0
+// AVP: Originating-IOI (839) 3GPP (10415)
+// 7.2.123
+type AVP_UTF8String Originating_IOI;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Originator (864) 3GPP (10415)
+// 7.2.124
+type enumerated Originator
+{
+  CALLING_PARTY	(0),
+  CALLED_PARTY 	(1)
+}
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Originator-Address (886) 3GPP (10415)
+// 7.2.125
+type AVP_Grouped Originator_Address;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Originator-Interface (2009) 3GPP (10415)
+// 7.2.126
+type AVP_Grouped Originator_Interface;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Originator-Received-Address (2027) 3GPP (10415)
+// 7.2.127
+type AVP_Grouped Originator_Received_Address;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Originating-SCCP-Address (2008) 3GPP (10415)
+// 7.2.128
+type AVP_Address Originating_SCCP_Address;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Outgoing-Session-Id (2320) 3GPP (10415)
+// 7.2.128A
+type AVP_UTF8String Outgoing_Session_Id;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Outgoing-Trunk-Group-Id (853) 3GPP (10415)
+// 7.2.129
+type AVP_UTF8String Outgoing_Trunk_Group_Id;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Participants-Involved (887) 3GPP (10415)
+// 7.2.130
+type AVP_UTF8String Participants_Involved;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Participant-Group (1260) 3GPP (10415)
+// 7.2.131
+type AVP_Grouped Participant_Group;
+
+// 3GPP TS 32.299 V13.9.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 V13.9.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 V13.9.0
+// AVP: PC3-Control-Protocol-Cause (3434) 3GPP (10415)
+// 7.2.135A
+type AVP_Integer32 PC3_Control_Protocol_Cause;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: PC3-EPC-Control-Protocol-Cause (3435) 3GPP (10415)
+// 7.2.135B
+type AVP_Integer32 PC3_EPC_Control_Protocol_Cause;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: PDN-Connection-Charging-ID (2050) 3GPP (10415)
+// 7.2.136
+type AVP_Unsigned32 PDN_Connection_Charging_ID;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: PDP-Address (1227) 3GPP (10415)
+// 7.2.137
+type AVP_Address PDP_Address;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: PDP-Address-Prefix-Length (2606) 3GPP (10415)
+// 7.2.137A
+type AVP_Unsigned32 PDP_Address_Prefix_Length;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: PDP-Context-Type (1247) 3GPP (10415)
+// 7.2.138
+type enumerated PDP_Context_Type
+{
+  PRIMARY   (0),
+  SECONDARY (1)
+}
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Play-Alternative (3913) 3GPP (10415)
+// 7.2.138A
+type enumerated Play_Alternative
+{
+  SERVED_PARTY   (0),
+  REMOTE_PARTY (1)
+}
+
+// 3GPP TS 32.299 V13.9.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 V13.9.0
+// AVP: PoC-Change-Time (1262) 3GPP (10415)
+// 7.2.140
+type AVP_Time PoC_Change_Time;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: PoC-Controlling-Address (858) 3GPP (10415)
+// 7.2.141
+type AVP_UTF8String PoC_Controlling_Address;
+
+// 3GPP TS 32.299 V13.9.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 V13.9.0
+// AVP: PoC-Group-Name (859) 3GPP (10415)
+// 7.2.143
+type AVP_UTF8String PoC_Group_Name;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: PoC-Information (879) 3GPP (10415)
+// 7.2.144
+type AVP_Grouped PoC_Information;
+
+// 3GPP TS 32.299 V13.9.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 V13.9.0
+// AVP: PoC-Session-Id (1229) 3GPP (10415)
+// 7.2.146
+type AVP_UTF8String PoC_Session_Id;
+
+// 3GPP TS 32.299 V13.9.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 V13.9.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 V13.9.0
+// AVP: PoC-User-Role (1252) 3GPP (10415)
+// 7.2.149
+type AVP_Grouped PoC_User_Role;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: PoC-User-Role-IDs (1253) 3GPP (10415)
+// 7.2.150
+type AVP_UTF8String PoC_User_Role_IDs;
+
+// 3GPP TS 32.299 V13.9.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 V13.9.0
+// AVP: Positioning-Data (1245) 3GPP (10415)
+// 7.2.152
+type AVP_UTF8String Positioning_Data;
+
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Preferred-AoC-Currency (2315) 3GPP (10415)
+// 7.2.153
+type AVP_Unsigned32 Preferred_AoC_Currency;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Priority (1209) 3GPP (10415)
+// 7.2.154
+type enumerated Priority
+{
+  LOW    (0),
+  NORMAL (1),
+  HIGH   (2)
+}
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Privacy-Indicator (3915) 3GPP (10415)
+// 7.2.154aA
+type enumerated Privacy_Indicator
+{
+  NOT_PRIVATE    (0),
+  PRIVATE (1)
+}
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: ProSe-3rd-Party-Application-ID (3440) 3GPP (10415)
+// 7.2.154A
+type AVP_UTF8String ProSe_3rd_Party_Application_ID;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: ProSe-Direct-Communication-Reception-Data-Container (3461) 3GPP (10415)
+// 7.2.154Aa
+type AVP_Grouped ProSe_Direct_Communication_Reception_Data_Container;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: ProSe-Direct-Communication-Transmission-Data-Container (3441) 3GPP (10415)
+// 7.2.154B
+type AVP_Grouped ProSe_Direct_Communication_Transmission_Data_Container;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: ProSe-Direct-Discovery-Model (3442) 3GPP (10415)
+// 7.2.154C
+type enumerated ProSe_Direct_Discovery_Model
+{
+  MODEL_A (0),
+  MODEL_B (1)
+}
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: ProSe-Event-Type (3443) 3GPP (10415)
+// 7.2.154D
+type enumerated ProSe_Event_Type
+{
+  ANNOUNCING (0),
+  MONITORING (1),
+  MATCH_REPORT (2)
+}
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: ProSe-Function-IP-Address (3444) 3GPP (10415)
+// 7.2.154E
+type AVP_Address ProSe_Function_IP_Address;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: ProSe-Function-PLMN-Identifier (3457) 3GPP (10415)
+// 7.2.154F
+type AVP_UTF8String ProSe_Function_PLMN_Identifier;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: ProSe-Functionality (3445) 3GPP (10415)
+// 7.2.154G
+type enumerated ProSe_Functionality
+{
+  DIRECT_DISCOVERY (0),
+  EPC_LEVEL_DISCOVERY (1),
+  DIRECT_COMMUNICATION (2)
+}
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: ProSe-Group-IP-Multicast-Address (3446) 3GPP (10415)
+// 7.2.154H
+type AVP_Address ProSe_Group_IP_Multicast_Address;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: ProSe-Information (3447) 3GPP (10415)
+// 7.2.154I
+type AVP_Grouped ProSe_Information;
+
+// WARNING: Unsigned32 used instead of enumerated type
+// 3GPP TS 32.299 V13.9.0
+// AVP: ProSe-Range-Class (3448) 3GPP (10415)
+// 7.2.154J
+type AVP_Unsigned32 ProSe_Range_Class;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: ProSe-Reason-For-Cancellation (3449) 3GPP (10415)
+// 7.2.154K
+type enumerated ProSe_Reason_For_Cancellation
+{
+  PROXIMITY_ALERT_SENT (0),
+  TIME_EXPIRED_WITH_NO_RENEWAL (1),
+  REQUESTOR_CANCELLATION (2)
+}
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: ProSe-Request-Timestamp (3450) 3GPP (10415)
+// 7.2.154L
+type AVP_Time ProSe_Request_Timestamp;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: ProSe-Role-Of-UE (3451) 3GPP (10415)
+// 7.2.154M
+type enumerated ProSe_Role_Of_UE
+{
+  ANNOUNCING_UE (0),
+  MONITORING_UE (1),
+  REQUESTOR_UE (2),
+  REQUESTED_UE (3)
+}
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: ProSe-Source-IP-Address (3452) 3GPP (10415)
+// 7.2.154N
+type AVP_Address ProSe_Source_IP_Address;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: ProSe-UE-ID (3453) 3GPP (10415)
+// 7.2.154O
+type AVP_OctetString ProSe_UE_ID;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Proximity-Alert-Indication (3454) 3GPP (10415)
+// 7.2.154P
+type enumerated Proximity_Alert_Indication
+{
+  ALERT (0),
+  NO_ALERT (1)
+}
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Proximity-Alert-Timestamp (3455) 3GPP (10415)
+// 7.2.154Q
+type AVP_Time Proximity_Alert_Timestamp;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Proximity-Cancellation-Timestamp (3456) 3GPP (10415)
+// 7.2.154R
+type AVP_Time Proximity_Cancellation_Timestamp;
+
+// 3GPP TS 32.299 V13.9.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 V13.9.0
+// AVP: PS-Free-Format-Data (866) 3GPP (10415)
+// 7.2.156
+type AVP_OctetString PS_Free_Format_Data;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: PS-Furnish-Charging-Information (865) 3GPP (10415)
+// 7.2.157
+type AVP_Grouped PS_Furnish_Charging_Information;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: PS-Information (874) 3GPP (10415)
+// 7.2.158
+type AVP_Grouped PS_Information;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Quota-Consumption-Time (881) 3GPP (10415)
+// 7.2.159
+type AVP_Unsigned32 Quota_Consumption_Time;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Quota-Holding-Time (871) 3GPP (10415)
+// 7.2.160
+type AVP_Unsigned32 Quota_Holding_Time;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Quota-Indicator (3912) 3GPP (10415)
+// 7.2.160aA
+type enumerated Quota_Indicator
+{
+  QUOTA_IS_NOT_USED_DURING_PLAYBACK (0),
+  QUOTA_IS_USED_DURING_PLAYBACK (1)
+}
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Radio-Frequency (3462) 3GPP (10415)
+// 7.2.160A
+type AVP_OctetString Radio_Frequency;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Radio-Parameter-Set-Info (3463) 3GPP (10415)
+// 7.2.160B
+type AVP_Grouped Radio_Parameter_Set_Info;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Radio-Parameter-Set-Values (3464) 3GPP (10415)
+// 7.2.160C
+type AVP_OctetString Radio_Parameter_Set_Values;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Radio-Resources-Indicator (3465) 3GPP (10415)
+// 7.2.160D
+type AVP_Integer32 Radio_Resources_Indicator;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Rate-Control-Max-Message-Size (3937) 3GPP (10415)
+// 7.2.160E
+type AVP_Integer32 Rate_Control_Max_Message_Size;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Rate-Control-Max-Rate (3938) 3GPP (10415)
+// 7.2.160F
+type AVP_Integer32 Rate_Control_Max_Rate;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Rate-Control-Time-Unit (3939) 3GPP (10415)
+// 7.2.160G
+type AVP_Integer32 Rate_Control_Time_Unit;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Rate-Element (2058) 3GPP (10415)
+// 7.2.161
+type AVP_Grouped Rate_Element;
+
+// 3GPP TS 32.299 V13.9.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 V13.9.0
+// AVP: Real-Time-Tariff-Information (2305) 3GPP (10415)
+// 7.2.164
+type AVP_Grouped Real_Time_Tariff_Information;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Reason-Header (3401) 3GPP (10415)
+// 7.2.164A
+type AVP_UTF8String Reason_Header;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Received-Talk-Burst-Time (1284) 3GPP (10415)
+// 7.2.165
+type AVP_Unsigned32 Received_Talk_Burst_Time;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Received-Talk-Burst-Volume (1285) 3GPP (10415)
+// 7.2.166
+type AVP_Unsigned32 Received_Talk_Burst_Volume;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Recipient-Address (1201) 3GPP (10415)
+// 7.2.167
+type AVP_Grouped Recipient_Address;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Recipient-Info (2026) 3GPP (10415)
+// 7.2.168
+type AVP_Grouped Recipient_Info;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Recipient-Received-Address (2028) 3GPP (10415)
+// 7.2.169
+type AVP_Grouped Recipient_Received_Address;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Recipient-SCCP-Address (2010) 3GPP (10415)
+// 7.2.170
+type AVP_Address Recipient_SCCP_Address;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Refund-Information (2022) 3GPP (10415)
+// 7.2.171
+type AVP_OctetString Refund_Information;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Relationship-Mode (2706) 3GPP (10415)
+// 7.2.171A
+type enumerated Relationship_Mode
+{
+  Trusted (0),
+  Non_Trusted (1)
+}
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Related-Change-Condition-Information (3925) 3GPP (10415)
+// 7.2.171Aa
+type AVP_Grouped Related_Change_Condition_Information;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Related-Trigger (3926) 3GPP (10415)
+// 7.2.171Ab
+type AVP_Grouped Related_Trigger;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Related-IMS-Charging-Identifier (2711) 3GPP (10415)
+// 7.2.171B
+type AVP_UTF8String Related_IMS_Charging_Identifier;
+
+// 3GPP TS 32.299 V13.9.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 V13.9.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 V13.9.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 V13.9.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 V13.9.0
+// AVP: Requested-Party-Address (1251) 3GPP (10415)
+// 7.2.176
+type AVP_UTF8String Requested_Party_Address;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Requested-PLMN-Identifier (3436) 3GPP (10415)
+// 7.2.176A
+type AVP_UTF8String Requested_PLMN_Identifier;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Requestor-PLMN-Identifier (3437) 3GPP (10415)
+// 7.2.176B
+type AVP_UTF8String Requestor_PLMN_Identifier;
+
+// 3GPP TS 32.299 V13.9.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),
+  FORWARDING_ROLE   (2)
+}
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Role-Of-ProSe-Function (3438) 3GPP (10415)
+// 7.2.177aA
+type enumerated Role_Of_ProSe_Function
+{
+  HPLMN  (0),
+  VPLMN  (1),
+  LOCAL_PLMN (2)
+}
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Route-Header-Received (3403) 3GPP (10415)
+// 7.2.177A
+type AVP_UTF8String Route_Header_Received;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Route-Header-Transmitted (3404) 3GPP (10415)
+// 7.2.177B
+type AVP_UTF8String Route_Header_Transmitted;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Scale-Factor (2059) 3GPP (10415)
+// 7.2.178
+type AVP_Grouped Scale_Factor;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: SCS-Address (3941) 3GPP (10415)
+// 7.2.178A
+type AVP_Address SCS_Address;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: SCS-AS-Address (3940) 3GPP (10415)
+// 7.2.178B
+type AVP_Grouped SCS_AS_Address;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: SCS-Realm (3942) 3GPP (10415)
+// 7.2.178C
+type AVP_DiameterIdentity SCS_Realm;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: SDP-Answer-Timestamp (1275) 3GPP (10415)
+// 7.2.179
+type AVP_Time SDP_Answer_Timestamp;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: SDP-Media-Component (843) 3GPP (10415)
+// 7.2.180
+type AVP_Grouped SDP_Media_Component;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: SDP-Media-Description (845) 3GPP (10415)
+// 7.2.181
+type AVP_UTF8String SDP_Media_Description;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: SDP-Media-Name (844) 3GPP (10415)
+// 7.2.182
+type AVP_UTF8String SDP_Media_Name;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: SDP-Offer-Timestamp (1274) 3GPP (10415)
+// 7.2.183
+type AVP_Time SDP_Offer_Timestamp;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: SDP-Session-Description (842) 3GPP (10415)
+// 7.2.184
+type AVP_UTF8String SDP_Session_Description;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: SDP-TimeStamps (1273) 3GPP (10415)
+// 7.2.185
+type AVP_Grouped SDP_TimeStamps;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: SDP-Type (2036) 3GPP (10415)
+// 7.2.186
+type enumerated SDP_Type
+{
+  SDP_OFFER  (0),
+  SDP_ANSWER (1)
+}
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Session-Direction	(2707) 3GPP (10415)
+// 7.2.186A
+type enumerated Session_Direction
+{
+  Inbound (0),
+  Outbound (1)
+}
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Served-Party-IP-Address	(848) 3GPP (10415)
+// 7.2.187
+type AVP_Address Served_Party_IP_Address;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Service-Data-Container (2040) 3GPP (10415)
+// 7.2.189
+type AVP_Grouped Service_Data_Container;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Service-Id (855) 3GPP (10415)
+// 7.2.190
+type AVP_UTF8String Service_Id;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Service-Generic-Information (1256) 3GPP (10415)
+// 7.2.191
+type AVP_Grouped Service_Generic_Information;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Service-Information (873) 3GPP (10415)
+// 7.2.192
+type AVP_Grouped Service_Information;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Service-Mode (2032) 3GPP (10415)
+// 7.2.193
+type AVP_Unsigned32 Service_Mode;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Service-Specific-Data (863) 3GPP (10415)
+// 7.2.194
+type AVP_UTF8String Service_Specific_Data;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Service-Specific-Info (1249) 3GPP (10415)
+// 7.2.195
+type AVP_Grouped Service_Specific_Info;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Service-Specific-Type (1257) 3GPP (10415)
+// 7.2.196
+type AVP_Unsigned32 Service_Specific_Type;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Serving-Node-Identity (3929) 3GPP (10415)
+// 7.2.197A
+type AVP_DiameterIdentity Serving_Node_Identity;
+
+// 3GPP TS 32.299 V13.9.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),
+  TWAN      (6)
+}
+
+// 3GPP TS 32.299 V13.9.0
+// AVP:  SGi-PtP-Tunnelling-Method (3931) 3GPP (10415)
+// 7.2.198A
+type enumerated SGi_PtP_Tunnelling_Method
+{
+  UDP_IP_BASED      (0),
+  Others            (1)
+}
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: SGSN-Address (1228) 3GPP (10415)
+// 7.2.199
+type AVP_Address SGSN_Address;
+
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: SGW-Address (2067) 3GPP (10415)
+// 7.2.199A
+type AVP_Address SGW_Address;
+
+// 3GPP TS 32.299 V13.9.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 V13.9.0
+// AVP: SIP-Method (824) 3GPP (10415)
+// 7.2.201
+type AVP_UTF8String SIP_Method;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: SIP-Request-Timestamp (834) 3GPP (10415)
+// 7.2.202
+type AVP_Time SIP_Request_Timestamp;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: SIP-Request-Timestamp-Fraction (2301) 3GPP (10415)
+// 7.2.203
+type AVP_Unsigned32 SIP_Request_Timestamp_Fraction;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: SIP-Response-Timestamp (835) 3GPP (10415)
+// 7.2.204
+type AVP_Time SIP_Response_Timestamp;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: SIP-Response-Timestamp-Fraction (2302) 3GPP (10415)
+// 7.2.205
+type AVP_Unsigned32 SIP_Response_Timestamp_Fraction;
+
+// 3GPP TS 32.299 V13.9.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 V13.9.0
+// AVP: SM-Device-Trigger-Information (3405) 3GPP (10415)
+// 7.2.205B
+type AVP_Grouped SM_Device_Trigger_Information;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: SM-Discharge-Time (2012) 3GPP (10415)
+// 7.2.206
+type AVP_Time SM_Discharge_Time;
+
+// 3GPP TS 32.299 V13.9.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 V13.9.0
+// AVP: SM-Protocol-ID (2013) 3GPP (10415)
+// 7.2.208
+type AVP_OctetString SM_Protocol_ID;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: SM-Sequence-Number (3408) 3GPP (10415)
+// 7.2.208A
+type AVP_Unsigned32 SM_Sequence_Number;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: SM-Status (2014) 3GPP (10415)
+// 7.2.209
+type AVP_OctetString SM_Status;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: SM-User-Data-Header (2015) 3GPP (10415)
+// 7.2.210
+type AVP_OctetString SM_User_Data_Header;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: SMS-Information (2000) 3GPP (10415)
+// 7.2.211
+type AVP_Grouped SMS_Information;
+
+// 3GPP TS 32.299 V13.9.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 V13.9.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 V13.9.0
+// AVP: SM-Service-Type (2029) 3GPP (10415)
+// 7.2.213
+type AVP_Unsigned32 SM_Service_Type;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: SMSC-Address (2017) 3GPP (10415)
+// 7.2.214
+type AVP_Address SMSC_Address;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Start-Of-Charging (3419) 3GPP (10415)
+// 7.2.214A
+type AVP_Time Start_Of_Charging;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Start-Time (2041) 3GPP (10415)
+// 7.2.215
+type AVP_Time Start_Time;
+
+// 3GPP TS 32.299 V13.9.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 V13.9.0
+// AVP: Stop-Time (2042) 3GPP (10415)
+// 7.2.216
+type AVP_Time Stop_Time;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Submission-Time (1202) 3GPP (10415)
+// 7.2.217
+type AVP_Time Submission_Time;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Subscriber-Role (2033) 3GPP (10415)
+// 7.2.218
+type enumerated Subscriber_Role
+{
+  ORIGINATING (0),
+  TERMINATING (1)
+}
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Supplementary-Service (2048) 3GPP (10415)
+// 7.2.219
+type AVP_Grouped Supplementary_Service;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: TAD-Identifier (2717) 3GPP (10415)
+// 7.2.219A
+type enumerated TAD_Identifier
+{
+  CS (0),
+  PS (1)
+}
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Talk-Burst-Exchange (1255) 3GPP (10415)
+// 7.2.220
+type AVP_Grouped Talk_Burst_Exchange;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Talk-Burst-Time (1286) 3GPP (10415)
+// 7.2.221
+type AVP_Unsigned32 Talk_Burst_Time;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Talk-Burst-Volume (1287) 3GPP (10415)
+// 7.2.222
+type AVP_Unsigned32 Talk_Burst_Volume;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Tariff-Information (2060) 3GPP (10415)
+// 7.2.223
+type AVP_Grouped Tariff_Information;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Tariff-XML (2306) 3GPP (10415)
+// 7.2.224
+type AVP_UTF8String Tariff_XML;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Teleservice (3413) 3GPP (10415)
+// 7.2.224A
+type AVP_OctetString Teleservice;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Terminating-IOI (840) 3GPP (10415)
+// 7.2.225
+type AVP_UTF8String Terminating_IOI;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Time-First-Reception (3466) 3GPP (10415)
+// 7.2.225A
+type AVP_Time Time_First_Reception;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Time-First-Transmission (3467) 3GPP (10415)
+// 7.2.225B
+type AVP_Time Time_First_Transmission;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Time-First-Usage (2043) 3GPP (10415)
+// 7.2.226
+type AVP_Time Time_First_Usage;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Time-Indicator (3911) 3GPP (10415)
+// 7.2.226A
+type AVP_Unsigned32 Time_Indicator;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Time-Last-Usage (2044) 3GPP (10415)
+// 7.2.227
+type AVP_Time Time_Last_Usage;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Time-Quota-Mechanism (1270) 3GPP (10415)
+// 7.2.228
+type AVP_Grouped Time_Quota_Mechanism;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Time-Quota-Threshold (868) 3GPP (10415)
+// 7.2.229
+type AVP_Unsigned32 Time_Quota_Threshold;
+
+// 3GPP TS 32.299 V13.9.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 V13.9.0
+// AVP: Time-Stamps (833) 3GPP (10415)
+// 7.2.231
+type AVP_Grouped Time_Stamps;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Time-Usage (2045) 3GPP (10415)
+// 7.2.232
+type AVP_Unsigned32 Time_Usage;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Traffic-Data-Volumes (2046) 3GPP (10415)
+// 7.2.233
+type AVP_Grouped Traffic_Data_Volumes;
+
+// 3GPP TS 32.299 V13.9.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 V13.9.0
+// AVP: Transit-IOI-List (2701) 3GPP (10415)
+// 7.2.233B
+type AVP_UTF8String Transit_IOI_List;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Transmitter-Info (3468) 3GPP (10415)
+// 7.2.233C
+type AVP_Grouped Transmitter_Info;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Token-Text (1215) 3GPP (10415)
+// 7.2.234
+type AVP_UTF8String Token_Text;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Trigger (1264) 3GPP (10415)
+// 7.2.235
+type AVP_Grouped Trigger;
+
+// 3GPP TS 32.299 V13.9.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),
+  CHANGEINQOS_APN_AGGREGATE_MAXIMUM_BIT_RATE   (24),
+  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_ACCESS_FOR_A_SERVICE_DATA_FLOW     (62),
+  CHANGE_IN_USER_CSG_INFORMATION               (70),
+  CHANGE_IN_HYBRID_SUBSCRIBED_USER_CSG_INFORMATION (71),
+  CHANGE_IN_HYBRID_UNSUBSCRIBED_USER_CSG_INFORMATION (72),
+  CHANGE_OF_UE_PRESENCE_IN_PRESENCE_REPORTING_AREA (73),
+  CHANGE_IN_SERVING_PLMN_RATE_CONTROL          (74),
+  CHANGE_IN_APN_RATE_CONTROL                   (75)
+}
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Trunk-Group-Id (851) 3GPP (10415)
+// 7.2.237
+type AVP_Grouped Trunk_Group_Id;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: TWAG-Address (3903) 3GPP (10415)
+// 7.2.237Ba
+type AVP_Address TWAG_Address;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: TWAN-User-Location-Info (2714) 3GPP (10415)
+// 7.2.237C
+type AVP_Grouped TWAN_User_Location_Info;
+
+// WARNING: Unsigned32 used instead of enumerated type
+// 3GPP TS 32.299 V13.9.0
+// AVP: Type-Number (1204) 3GPP (10415)
+// 7.2.238
+type AVP_Unsigned32 Type_Number;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: UNI-PDU-CP-Only-Flag (3932) 3GPP (10415)
+// 7.2.238A
+type enumerated UNI_PDU_CP_Only_Flag
+{
+  UNI_PDU_both_UP_CP     (0),
+  UNI_PDU_CP_Only        (1)
+}
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Unit-Cost (2061) 3GPP (10415)
+// 7.2.239
+type AVP_Grouped Unit_Cost;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Unit-Quota-Threshold (1226) 3GPP (10415)
+// 7.2.240
+type AVP_Unsigned32 Unit_Quota_Threshold;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: User-CSG-Information (2319) 3GPP (10415)
+// 7.2.240A
+type AVP_Grouped User_CSG_Information;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Usage-Information-Report-Sequence-Number (3439) 3GPP (10415)
+// 7.2.240B
+type AVP_Integer32 Usage_Information_Report_Sequence_Number;
+
+// 3GPP TS 32.299 V13.9.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 V13.9.0
+// AVP: User-Session-Id (830) 3GPP (10415)
+// 7.2.242
+type AVP_UTF8String User_Session_Id;
+
+// 3GPP TS 32.299 V13.9.0 CR0716
+// AVP: UWAN-User-Location-Info (3918) 3GPP (10415)
+// 7.2.242aaA
+type AVP_Grouped UWAN_User_Location_Info;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Variable-Part (3907) 3GPP (10415)
+// 7.2.242aA
+type AVP_Grouped Variable_Part;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Variable-Part-Order (3908) 3GPP (10415)
+// 7.2.242aB
+type AVP_Unsigned32 Variable_Part_Order;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Variable-Part-Type (3909) 3GPP (10415)
+// 7.2.242aC
+type AVP_Unsigned32 Variable_Part_Type;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: Variable-Part-Value (3910) 3GPP (10415)
+// 7.2.242aD
+type AVP_UTF8String Variable_Part_Value;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: VCS-Information (3410) 3GPP (10415)
+// 7.2.242A
+type AVP_Grouped VCS_Information;
+
+// 3GPP TS 32.299 V13.9.0
+// AVP: VLR-Number (3420) 3GPP (10415)
+// 7.2.242B
+type AVP_OctetString VLR_Number;
+
+// 3GPP TS 32.299 V13.9.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 54b21c18514f61f96f07d8656aaa9826e2d2208d..21ad0ebd623e71842667aa3f83c1b29be88e1e4b 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 1134 62
 ///////////////////////////////////////////////
 
diff --git a/src/CxDxInterface_3GPP_TS29229_6a0.ddf b/src/CxDxInterface_3GPP_TS29229_6a0.ddf
index d2d0a253a828867b9132ec2f6a95da977e001cf0..e4d7bd3a83ca6ba96af244a7efe383260158275d 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/CxDxInterface_3GPP_TS29229_840.ddf b/src/CxDxInterface_3GPP_TS29229_840.ddf
index 2c8913066148a65db0479d8da3e10ad7478af4cd..90505cc6a92f3f5bdf0620b82a9d6d9ed3a8cc78 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/CxDxInterface_3GPP_TS29229_880.ddf b/src/CxDxInterface_3GPP_TS29229_880.ddf
index 1f7f27e906d0fcd544a3fccf9b96440e3323f3c0..e6c3eedd521d072a3fc55d6b376de011bd4ef933 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/CxDxInterface_3GPP_TS29229_920.ddf b/src/CxDxInterface_3GPP_TS29229_920.ddf
index c96c6c356f3bff72fb55cb7e89b045a6e9d20ad0..13fdbea3e61dd997abaa4198cdc77bd6bc2e6e5d 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/CxDxInterface_3GPP_TS29229_c30.ddf b/src/CxDxInterface_3GPP_TS29229_c30.ddf
index 3e8a484477c12c7bc8883125d1740ee864961bba..e65130f0ca04dbb743c02a34af7f4e1a163c883d 100644
--- a/src/CxDxInterface_3GPP_TS29229_c30.ddf
+++ b/src/CxDxInterface_3GPP_TS29229_c30.ddf
@@ -11,7 +11,7 @@
 //
 //  File:               CxDxInterface_3GPP_TS29229_c30.ddf
 //  Description:        DDF for CxDx according to 3GPP TS 29.229 V12.3.0
-//  Rev:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/CxDxInterface_Ericsson_1551_FAY301_0059_PC26.ddf b/src/CxDxInterface_Ericsson_1551_FAY301_0059_PC26.ddf
index 2ac2cb91cfc45624a342f74fda2958717202ce93..88716355489079341246759af80e390d1a569dc5 100644
--- a/src/CxDxInterface_Ericsson_1551_FAY301_0059_PC26.ddf
+++ b/src/CxDxInterface_Ericsson_1551_FAY301_0059_PC26.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               EricssonProprietaryCxDx.ddf
 //  Description:        DDF for Cx according to 1551-FAY 301 0059 Uen
-//  Rev:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/DIAMETER_EncDec.cc b/src/DIAMETER_EncDec.cc
index cb532ffd2554e6db1ae94cf914b66f52ab1f9c14..cb523de70ad986dfff0da45c3174f6acaca7f205 100644
--- a/src/DIAMETER_EncDec.cc
+++ b/src/DIAMETER_EncDec.cc
@@ -37,7 +37,7 @@
 //
 //  File:               DIAMETER_EncDec.cc
 //  Description:	Encoder/Decoder and external functions for DPMG
-//  Rev:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
@@ -196,6 +196,14 @@ INTEGER f__DIAMETER__Dec__fast(const OCTETSTRING& pl__oct, PDU__DIAMETER &pl__pd
   return 0;
 }
 
+void f_DIAMETER_log_hex(const char *prompt, const unsigned char *msg,
+  size_t length)
+{
+  if (prompt != NULL) TTCN_Logger::log_event_str(prompt);
+  TTCN_Logger::log_event("Size: %lu, Msg:", (unsigned long)length);
+  for (size_t i = 0; i < length; i++) TTCN_Logger::log_event(" %02x", msg[i]);
+}
+
 OCTETSTRING f_GetAVPByListOfCodesFromGroupedAVP(const unsigned char *temp, int data_len,  const integerList& pl__codeList, const bool orderedList, int& bestFromGrouped){
   const unsigned char *endp=temp+data_len;
   int avpLength = 0;
@@ -210,7 +218,7 @@ OCTETSTRING f_GetAVPByListOfCodesFromGroupedAVP(const unsigned char *temp, int d
   //if the f_GetAVPByListOfCodesFromGroupedAVP function was called, the bestFromGrouped variable will be initialized, else:
   if(bestFromGrouped < 0)bestFromGrouped = codelist_size;
      
-  while(temp < endp)
+  while(temp + 8 < endp)
   { 
     /* reading the avp code value*/
     avpCode = ((unsigned int)(*temp) << 24) + ((unsigned int)(*(temp + 1)) << 16)	+ ((unsigned int)(*(temp + 2)) << 8) + (unsigned int)(*(temp + 3));
@@ -220,6 +228,13 @@ OCTETSTRING f_GetAVPByListOfCodesFromGroupedAVP(const unsigned char *temp, int d
 
     /* calculating the length of the next AVP*/
     avpLength = ((unsigned int)(*temp) << 16) + ((unsigned int)(*(temp + 1)) << 8)	+ (unsigned int)(*(temp + 2));
+    if(avpLength < 8) {
+      TTCN_Logger::begin_event( TTCN_WARNING );
+      TTCN_Logger::log_event("Invalid AVP length: %d; ",avpLength);
+      f_DIAMETER_log_hex("AVP octets: ", temp - 5, endp - (temp + 5));
+      TTCN_Logger::end_event();
+      break;
+    }
     avpLength-=8;          // length of AVP data = AVP length - 4 - Vendor ID length (calculated below)
     if(*(temp-1) & 0x80){  // skip vendor id, VMPxxxxx is just before the first length octet
       avpLength-=4;
@@ -247,7 +262,7 @@ OCTETSTRING f_GetAVPByListOfCodesFromGroupedAVP(const unsigned char *temp, int d
       {
         if((const int)(pl__codeList[i]) == (int)avpCode)
         {
-          return OCTETSTRING(avpLength, temp);
+          return OCTETSTRING(avpLength > 0? avpLength:0, temp);
         }
       }
     };
@@ -288,7 +303,7 @@ OCTETSTRING f__DIAMETER__GetAVPByListOfCodesCombined(const OCTETSTRING& pl__oct,
   int   bestAVP_length = 0;
   int   bestFromGrouped = codelist_size; //Initializing the bestFromGrouped variable for the f_GetAVPByListOfCodesFromGroupedAVP function
      
-  while(temp < endp)
+  while(temp + 8 < endp)
   { 
     /* reading the avp code value*/
     avpCode = ((unsigned int)(*temp) << 24) + ((unsigned int)(*(temp + 1)) << 16)	+ ((unsigned int)(*(temp + 2)) << 8) + (unsigned int)(*(temp + 3));
@@ -297,6 +312,13 @@ OCTETSTRING f__DIAMETER__GetAVPByListOfCodesCombined(const OCTETSTRING& pl__oct,
 
     /* calculating the length of the next AVP*/
     avpLength = ((unsigned int)(*temp) << 16) + ((unsigned int)(*(temp + 1)) << 8)	+ (unsigned int)(*(temp + 2));
+    if(avpLength < 8) {
+      TTCN_Logger::begin_event( TTCN_WARNING );
+      TTCN_Logger::log_event("Invalid AVP length: %d; msg: ",avpLength);
+      pl__oct.log();
+      TTCN_Logger::end_event();
+      break;
+    }
     avpLength-=8;          // length of AVP data = AVP length - 4 - Vendor ID length (calculated below)
     if(*(temp-1) & 0x80){  // skip vendor id, VMPxxxxx is just before the first length octet
       avpLength-=4;
@@ -309,7 +331,7 @@ OCTETSTRING f__DIAMETER__GetAVPByListOfCodesCombined(const OCTETSTRING& pl__oct,
     {
       if((const int)(pl__codeList[i]) == (int)avpCode)
       {
-        if(i == 0)return OCTETSTRING(avpLength, temp); //Found AVP with highest priority
+        if(i == 0)return OCTETSTRING(avpLength > 0? avpLength:0, temp); //Found AVP with highest priority
         avpFound = true;
         bestAVP = (unsigned char *)temp;
         bestAVP_length = avpLength;
diff --git a/src/DIAMETER_EncDec.tpl b/src/DIAMETER_EncDec.tpl
index 99baf012117dede1437f0c4aa32bb1823faac8c6..5829102da7e8f4dc43f5a25b6331e7c23d55da71 100644
--- a/src/DIAMETER_EncDec.tpl
+++ b/src/DIAMETER_EncDec.tpl
@@ -36,7 +36,6 @@
 ******************************************************************************/
 
 #include "DIAMETER_Types.hh"
-#define BUF_SIZE 65536          // this buffer is used on data reception and outgoing encoding
 #include <math.h>
 #include <stdlib.h>
 #include <sys/time.h>
@@ -49,23 +48,23 @@ 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);
 
-int encode_AVP_OctetString(unsigned char* & p, const AVP__OctetString& avp);
-int encode_AVP_Integer(unsigned char* & p, const AVP__Integer32& avp);
-int encode_AVP_Integer64(unsigned char* & p, const AVP__Integer64& avp);
-int encode_AVP_Unsigned32(unsigned char* & p, const AVP__Unsigned32& avp);
-int encode_AVP_Unsigned64(unsigned char* & p, const AVP__Unsigned64& avp);
-int encode_AVP_Float32(unsigned char* & p, const AVP__Float32& avp);
-int encode_AVP_Float64(unsigned char* & p, const AVP__Float64& avp);
-int encode_AVP_Grouped(unsigned char* & p, const AVP__Grouped& avp);
-int encode_AVP_Address(unsigned char* & p, const AVP__Address& avp);
-int encode_AVP_IP_Address(unsigned char* & p, const AVP__IP__Address& avp);
-int encode_AVP_Time(unsigned char* & p, const AVP__Time& avp);
-int encode_AVP_UTF8String(unsigned char* & p, const AVP__UTF8String& avp);
-int encode_AVP_DiameterIdentity(unsigned char* & p, const AVP__DiameterIdentity& avp);
-int encode_AVP_DiameterURI(unsigned char* & p, const AVP__DiameterURI& avp);
-int encode_AVP_IPFilterRule(unsigned char* & p, const AVP__IPFilterRule& avp);
-int encode_AVP_QoSFilterRule(unsigned char* & p, const AVP__QoSFilterRule& avp);
-int encode_AVP_enumerated(unsigned char* & p, const int& avp);
+int encode_AVP_OctetString(TTCN_Buffer &p, const AVP__OctetString& avp);
+int encode_AVP_Integer(TTCN_Buffer &p, const AVP__Integer32& avp);
+int encode_AVP_Integer64(TTCN_Buffer &p, const AVP__Integer64& avp);
+int encode_AVP_Unsigned32(TTCN_Buffer &p, const AVP__Unsigned32& avp);
+int encode_AVP_Unsigned64(TTCN_Buffer &p, const AVP__Unsigned64& avp);
+int encode_AVP_Float32(TTCN_Buffer &p, const AVP__Float32& avp);
+int encode_AVP_Float64(TTCN_Buffer &p, const AVP__Float64& avp);
+int encode_AVP_Grouped(TTCN_Buffer &p, const AVP__Grouped& avp);
+int encode_AVP_Address(TTCN_Buffer &p, const AVP__Address& avp);
+int encode_AVP_IP_Address(TTCN_Buffer &p, const AVP__IP__Address& avp);
+int encode_AVP_Time(TTCN_Buffer &p, const AVP__Time& avp);
+int encode_AVP_UTF8String(TTCN_Buffer &p, const AVP__UTF8String& avp);
+int encode_AVP_DiameterIdentity(TTCN_Buffer &p, const AVP__DiameterIdentity& avp);
+int encode_AVP_DiameterURI(TTCN_Buffer &p, const AVP__DiameterURI& avp);
+int encode_AVP_IPFilterRule(TTCN_Buffer &p, const AVP__IPFilterRule& avp);
+int encode_AVP_QoSFilterRule(TTCN_Buffer &p, const AVP__QoSFilterRule& avp);
+int encode_AVP_enumerated(TTCN_Buffer &p, const int& avp);
 bool decode_AVP_OctetString(const unsigned char* & p,  AVP__OctetString& avp, int length);
 bool decode_AVP_Integer(const unsigned char* & p,  AVP__Integer32& avp, int length);
 bool decode_AVP_Integer64(const unsigned char* & p,  AVP__Integer64& avp, int length);
@@ -89,82 +88,40 @@ bool decode_AVP(const unsigned char* &p, AVP &avptype, const unsigned char* buf_
 
 
 ////////////////////////////////////////////////////////////
-void encode_bits_1byte(unsigned char* &p,
+void encode_bits_1byte(TTCN_Buffer &p,
 		const BITSTRING& bit1, const BITSTRING& bit2, const BITSTRING& therest) {
-	unsigned char ctemp;
-	BITSTRING datas = therest + (bit2 + bit1); // actually backwards
-	if (datas.lengthof() != 8)
-		TTCN_warning("Bitstring length %d is not exactly a byte.",
-				datas.lengthof());
-	ctemp = *(bit1);
-	*p = 0; // just in case
-	*p += (ctemp << 7) & 0x80; // 1000 0000
-	ctemp = *(bit2);
-	*p += (ctemp << 6) & 0x40; // 0100 0000
-	ctemp = *(therest); // needs flipping
-	*p += ((ctemp & 0x20) >> 5); // 0010 0000
-	*p += ((ctemp & 0x10) >> 3); // 0001 0000
-	*p += ((ctemp & 0x08) >> 1); // 0000 1000
-	*p += ((ctemp & 0x04) << 1); // 0000 0100
-	*p += ((ctemp & 0x02) << 3); // 0000 0010
-	*p += ((ctemp & 0x01) << 5); // 0000 0001
-	p++; // advance by a byte
+	BITSTRING datas = bit1 + bit2 + therest;
+	if (datas.lengthof() != 8){
+		TTCN_warning("Bitstring length %d is not exactly a byte.", datas.lengthof());
+  }
+  p.put_string(bit2oct(datas));
 }
 
 ////////////////////////////////////////////////////////////
-void encode_bits_1byte(unsigned char* &p,
+void encode_bits_1byte(TTCN_Buffer &p,
 		const BITSTRING& bit1, const BITSTRING& bit2, const BITSTRING& bit3,
 		const BITSTRING& therest) {
-	unsigned char ctemp;
-	BITSTRING datas = (therest + bit3) + (bit2 + bit1); // backwards?
-	if (datas.lengthof() != 8)
-		TTCN_warning("Bitstring length %d is not exactly a byte.",
-				datas.lengthof());
-	ctemp = *(bit1);
-	*p = 0; // just in case
-	*p += (ctemp << 7) & 0x80; // 1000 0000
-	ctemp = *(bit2);
-	*p += (ctemp << 6) & 0x40; // 0100 0000
-	ctemp = *(bit3);
-	*p += (ctemp << 5) & 0x20; // 0010 0000
-	ctemp = *(therest); // needs flipping
-	*p += ((ctemp & 0x10) >> 4); // 0001 0000
-	*p += ((ctemp & 0x08) >> 2); // 0000 1000
-	*p += ((ctemp & 0x04)); // 0000 0100
-	*p += ((ctemp & 0x02) << 2); // 0000 0010
-	*p += ((ctemp & 0x01) << 4); // 0000 0001
-	p++; // advance by a byte
+	BITSTRING datas = bit1 + bit2 + bit3 + therest;
+	if (datas.lengthof() != 8){
+		TTCN_warning("Bitstring length %d is not exactly a byte.", datas.lengthof());
+  }
+  p.put_string(bit2oct(datas));
 }
 
 ////////////////////////////////////////////////////////////
-void encode_bits_1byte(unsigned char* &p,
+void encode_bits_1byte(TTCN_Buffer &p,
 		const BITSTRING& bit1, const BITSTRING& bit2, const BITSTRING& bit3,
 		const BITSTRING& bit4, const BITSTRING& therest) {
-	unsigned char ctemp;
-	BITSTRING datas = ((((therest + bit4) + bit3) + bit2) + bit1); // backwards?
-	if (datas.lengthof() != 8)
-		TTCN_warning("Bitstring length %d is not exactly a byte.",
-				datas.lengthof());
-	ctemp = *(bit1);
-	*p = 0; // just in case
-	*p += (ctemp << 7) & 0x80; // 1000 0000
-	ctemp = *(bit2);
-	*p += (ctemp << 6) & 0x40; // 0100 0000
-	ctemp = *(bit3);
-	*p += (ctemp << 5) & 0x20; // 0010 0000
-	ctemp = *(bit4);
-	*p += (ctemp << 4) & 0x10; // 0001 0000
-	ctemp = *(therest); // needs flipping
-	*p += ((ctemp & 0x08) >> 3); // 0000 1000
-	*p += ((ctemp & 0x04) >> 1); // 0000 0100
-	*p += ((ctemp & 0x02) << 1); // 0000 0010
-	*p += ((ctemp & 0x01) << 3); // 0000 0001
-	p++; // advance by a byte
+	BITSTRING datas = bit1 + bit2 + bit3 + bit4 + therest;
+	if (datas.lengthof() != 8){
+		TTCN_warning("Bitstring length %d is not exactly a byte.", datas.lengthof());
+  }
+  p.put_string(bit2oct(datas));
 }
 
 
 ////////////////////////////////////////////////////////////
-void encode_octets(int len, unsigned char* &p,
+void encode_octets(int len, TTCN_Buffer &p,
 		const OCTETSTRING& data) {
 	if (data.lengthof() > len){
 		TTCN_error(
@@ -173,94 +130,80 @@ void encode_octets(int len, unsigned char* &p,
   }
   int padd=len-data.lengthof();
   for(;padd>0;padd--){
-    *(p++)='\0';
+    p.put_c('\0');
   }
-	memcpy(p, (const unsigned char*) data, data.lengthof());
-	p += data.lengthof();
+  p.put_string(data);
 }
 
 ////////////////////////////////////////////////////////////
-void encode_octets(unsigned char* &p, const OCTETSTRING& data) {
-	memcpy(p, (const unsigned char*) data, data.lengthof());
-	p += data.lengthof();
+void encode_octets(TTCN_Buffer &p, const OCTETSTRING& data) {
+  p.put_string(data);
 }
 
 ////////////////////////////////////////////////////////////
-void pad_oct_if_needed(unsigned char* &p, int unpaddedsize) { //if called, pads unpaddedsize's distance to closest 4-octet boundary
+void pad_oct_if_needed(TTCN_Buffer &p, int unpaddedsize) { //if called, pads unpaddedsize's distance to closest 4-octet boundary
 	encode_octets(p, OCTETSTRING((4 - unpaddedsize % 4) % 4,
 			(const unsigned char*) "\0\0\0"));
 }
 
 ////////////////////////////////////////////////////////////
-void encode_chars(unsigned char* &p, const CHARSTRING& data) {
-	memcpy(p, (const char*) data, data.lengthof());
-	p += data.lengthof();
+void encode_chars(TTCN_Buffer &p, const CHARSTRING& data) {
+  p.put_string(data);
 }
 
 ////////////////////////////////////////////////////////////
-void encode_int_1byte(unsigned char* &p, unsigned int data) {
+void encode_int_1byte(TTCN_Buffer &p, unsigned int data) {
 	if ((data >> 8) != 0)
 		TTCN_error("Integer value %d is too long to fit in 1 byte.", data);
-	*(p++) = data & 0xFF;
+  p.put_c(data & 0xFF);
 }
 
 ////////////////////////////////////////////////////////////
-void encode_int_2byte(unsigned char* &p, unsigned int data) {
+void encode_int_2byte(TTCN_Buffer &p, unsigned int data) {
 	if ((data >> 16) != 0)
 		TTCN_error("Integer value %d is too long to fit in 2 bytes.", data);
-	*(p++) = (data >> 8) & 0xFF;
-	*(p++) = data & 0xFF;
+  p.put_c((data >> 8) & 0xFF);
+  p.put_c(data & 0xFF);
 }
 
 ////////////////////////////////////////////////////////////
-void encode_int_3byte(unsigned char* &p, unsigned int data) {
+void encode_int_3byte(TTCN_Buffer &p, unsigned int data) {
 	if ((data >> 24) != 0)
 		TTCN_error("Integer value %d is too long to fit in 3 bytes.", data);
-	*(p++) = (data >> 16) & 0xFF;
-	*(p++) = (data >> 8) & 0xFF;
-	*(p++) = data & 0xFF;
+  p.put_c((data >> 16) & 0xFF);
+  p.put_c((data >> 8) & 0xFF);
+  p.put_c(data & 0xFF);
 }
 
 ////////////////////////////////////////////////////////////
-void encode_int_4byte(unsigned char* &p, unsigned int data) {
-	*(p++) = (data >> 24) & 0xFF;
-	*(p++) = (data >> 16) & 0xFF;
-	*(p++) = (data >> 8) & 0xFF;
-	*(p++) = data & 0xFF;
-}
-
-void encode_u32_4byte(unsigned char* &p, const INTEGER& data) {
-  if(data.is_native()){
-    const int data2=data;
-	  *(p++) = (data2 >> 24) & 0xFF;
-	  *(p++) = (data2 >> 16) & 0xFF;
-	  *(p++) = (data2 >> 8) & 0xFF;
-	  *(p++) = data2 & 0xFF;
-  } else {
-	  OCTETSTRING os = int2oct(data, 4);
-	  memcpy(p, (const unsigned char*) os, 4);
-	  p += 4;
-  }
+void encode_int_4byte(TTCN_Buffer &p, unsigned int data) {
+  p.put_c((data >> 24) & 0xFF);
+  p.put_c((data >> 16) & 0xFF);
+  p.put_c((data >> 8) & 0xFF);
+  p.put_c(data & 0xFF);
+}
+
+void encode_u32_4byte(TTCN_Buffer &p, const INTEGER& data) {
+  p.put_string(int2oct(data, 4));
 } // encode_u32_4byte
 
 
 ////////////////////////////////////////////////////////////
-void encode_signed_int_4byte(unsigned char* &p, const int data) {
-	*(p++) = (data >> 24) & 0xFF;
-	*(p++) = (data >> 16) & 0xFF;
-	*(p++) = (data >> 8) & 0xFF;
-	*(p++) = data & 0xFF;
+void encode_signed_int_4byte(TTCN_Buffer &p, const int data) {
+  p.put_c((data >> 24) & 0xFF);
+  p.put_c((data >> 16) & 0xFF);
+  p.put_c((data >> 8) & 0xFF);
+  p.put_c(data & 0xFF);
 }
 
 ////////////////////////////////////////////////////////////
-void encode_float_8byte(unsigned char* &p, const double data) {
+void encode_float_8byte(TTCN_Buffer &p, const double data) {
 	unsigned char* poi = (unsigned char*) &data;
 #if defined __sparc__ || defined __sparc
-    memcpy(p,poi,8);
+    p.put_s(8,poi);
 #else
-    for (int i = 0, k = 7; i < 8; i++, k--) p[i] = poi[k];
+    for (int i = 0, k = 7; i < 8; i++, k--) p.put_c(poi[k]);
 #endif
-  p+=8;
 }
 
 
@@ -321,21 +264,10 @@ bool chk_zero(const OCTETSTRING& var) {return var==os_h_or_e_id_oct;}
 
 
 void f__DIAMETER__Enc__fast(const PDU__DIAMETER& pl__pdu, OCTETSTRING& pl__oct){
-  int message_length=0;
-  int encoded_length=0;
-  
-  TTCN_Buffer buf;
-  buf.clear();
-  size_t len=BUF_SIZE; // header length
-  unsigned char* p;
-  buf.get_end(p,len);
-	unsigned char *start_ptr = p;
-
-
-	encode_int_1byte(p, (unsigned int) pl__pdu.version());
-	unsigned char *length_ptr = p;
-	p += 3; // save *length for later use
   
+  TTCN_Buffer p;
+  p.clear();
+ 
 #ifdef DPMG_USE_DETAILED_BITS
 	encode_bits_1byte(p, pl__pdu.R__bit(), pl__pdu.P__bit(), pl__pdu.E__bit(),
 			pl__pdu.T__bit(), pl__pdu.r__bits());
@@ -385,13 +317,12 @@ void f__DIAMETER__Enc__fast(const PDU__DIAMETER& pl__pdu, OCTETSTRING& pl__oct){
 #endif
   }
 
-  encoded_length=encode_AVP_Grouped(p, pl__pdu.avps());
- 
-  message_length = p - start_ptr; // TP must calc it
-	encode_int_3byte(length_ptr, (unsigned int) message_length);
+  encode_AVP_Grouped(p, pl__pdu.avps());
+
 
-  buf.increase_length(message_length);
-  buf.get_string(pl__oct);
+  OCTETSTRING tmp; 
+  p.get_string(tmp);
+  pl__oct = int2oct(pl__pdu.version(),1) + int2oct(tmp.lengthof()+4,3) + tmp;
   return;
 }
 
@@ -403,7 +334,13 @@ OCTETSTRING f__DIAMETER__Enc(const PDU__DIAMETER& pl__pdu)
   return ret_val;
 }
 
-
+void f_DIAMETER_log_hex(const char *prompt, const unsigned char *msg,
+  size_t length)
+{
+    if (prompt != NULL) TTCN_Logger::log_event_str(prompt);
+    TTCN_Logger::log_event("Size: %lu, Msg:", (unsigned long)length);
+    for (size_t i = 0; i < length; i++) TTCN_Logger::log_event(" %02x", msg[i]);
+}
 
 OCTETSTRING f_GetAVPByListOfCodesFromGroupedAVP(const unsigned char *temp, int data_len,  const integerList& pl__codeList){
   const unsigned char *endp=temp+data_len;
@@ -411,17 +348,25 @@ OCTETSTRING f_GetAVPByListOfCodesFromGroupedAVP(const unsigned char *temp, int d
   unsigned int avpCode = 0;
 
   int codelist_size=pl__codeList.size_of();
-     
-  while(temp < endp)
-  { 
+
+  // an AVP is at least 8 bytes long - see RFC 3588 / 4.1.  AVP Header
+  while(temp + 8 < endp)
+  {
     /* reading the avp code value*/
-    avpCode = ((unsigned int)(*temp) << 24) + ((unsigned int)(*(temp + 1)) << 16)	+ ((unsigned int)(*(temp + 2)) << 8) + (unsigned int)(*(temp + 3));
-    
+    avpCode = ((unsigned int)(*temp) << 24) + ((unsigned int)(*(temp + 1)) << 16) + ((unsigned int)(*(temp + 2)) << 8) + (unsigned int)(*(temp + 3));
+
     temp+=5; // AVP code & VMPxxxxx octets (checked later)
              // tmp now points to the first length octet
 
     /* calculating the length of the next AVP*/
-    avpLength = ((unsigned int)(*temp) << 16) + ((unsigned int)(*(temp + 1)) << 8)	+ (unsigned int)(*(temp + 2));
+    avpLength = ((unsigned int)(*temp) << 16) + ((unsigned int)(*(temp + 1)) << 8) + (unsigned int)(*(temp + 2));
+    if(avpLength < 8) {
+      TTCN_Logger::begin_event( TTCN_WARNING );
+      TTCN_Logger::log_event("Invalid AVP length: %d; ",avpLength);
+      f_DIAMETER_log_hex("AVP octets: ", temp - 5, endp - (temp + 5));
+      TTCN_Logger::end_event();
+      break;
+    }
     avpLength-=8;          // length of AVP data = AVP length - 4 - Vendor ID length (calculated below)
     if(*(temp-1) & 0x80){  // skip vendor id, VMPxxxxx is just before the first length octet
       avpLength-=4;
@@ -434,19 +379,19 @@ OCTETSTRING f_GetAVPByListOfCodesFromGroupedAVP(const unsigned char *temp, int d
     {
       if((const int)(pl__codeList[i]) == (int)avpCode)
       {
-        return OCTETSTRING(avpLength, temp);
+        return OCTETSTRING(avpLength > 0? avpLength:0, temp);
       }
     }
-    
+
     // skip to the next avp
     if(avpLength % 4 != 0)  // AVP padding
-    { 
+    {
       avpLength = avpLength + (4 - (avpLength % 4));
     }
-    temp+=avpLength;  
+    temp+=avpLength;
   }
   /* no AVP was found, returns an empty octetstring*/  
-  unsigned char noResult[0];      
+  unsigned char noResult[0];
   return OCTETSTRING(0, noResult);
 }
 
@@ -454,23 +399,31 @@ OCTETSTRING f__DIAMETER__GetAVPByListOfCodesCombined(const OCTETSTRING& pl__oct,
 {
   const unsigned char *temp= (const unsigned char *)pl__oct;
   const unsigned char *endp=temp+pl__oct.lengthof();
-  
+
   temp += 20; // skip the DIAMETER header
   int avpLength = 0;
   unsigned int avpCode = 0;
 
   int codelist_size=pl__codeList.size_of();
   int groupcodeList_size=pl__groupcodeList.size_of();
-     
-  while(temp < endp)
-  { 
+
+  // an AVP is at least 8 bytes long - see RFC 3588 / 4.1.  AVP Header
+  while(temp + 8 < endp)
+  {
     /* reading the avp code value*/
-    avpCode = ((unsigned int)(*temp) << 24) + ((unsigned int)(*(temp + 1)) << 16)	+ ((unsigned int)(*(temp + 2)) << 8) + (unsigned int)(*(temp + 3));
+    avpCode = ((unsigned int)(*temp) << 24) + ((unsigned int)(*(temp + 1)) << 16) + ((unsigned int)(*(temp + 2)) << 8) + (unsigned int)(*(temp + 3));
     temp+=5; // AVP code & VMPxxxxx octets
              // tmp now points to the first length octet
 
     /* calculating the length of the next AVP*/
-    avpLength = ((unsigned int)(*temp) << 16) + ((unsigned int)(*(temp + 1)) << 8)	+ (unsigned int)(*(temp + 2));
+    avpLength = ((unsigned int)(*temp) << 16) + ((unsigned int)(*(temp + 1)) << 8) + (unsigned int)(*(temp + 2));
+    if(avpLength < 8) {
+      TTCN_Logger::begin_event( TTCN_WARNING );
+      TTCN_Logger::log_event("Invalid AVP length: %d; msg: ",avpLength);
+      pl__oct.log();
+      TTCN_Logger::end_event();
+      break;
+    }
     avpLength-=8;          // length of AVP data = AVP length - 4 - Vendor ID length (calculated below)
     if(*(temp-1) & 0x80){  // skip vendor id, VMPxxxxx is just before the first length octet
       avpLength-=4;
@@ -483,10 +436,10 @@ OCTETSTRING f__DIAMETER__GetAVPByListOfCodesCombined(const OCTETSTRING& pl__oct,
     {
       if((const int)(pl__codeList[i]) == (int)avpCode)
       {
-        return OCTETSTRING(avpLength, temp);
+        return OCTETSTRING(avpLength > 0? avpLength:0, temp);
       }
     }
-    
+
     // Chek for the groupped AVP to search in
     for(int i = 0; i < groupcodeList_size; i++)
     {
@@ -504,12 +457,13 @@ OCTETSTRING f__DIAMETER__GetAVPByListOfCodesCombined(const OCTETSTRING& pl__oct,
     { 
       avpLength = avpLength + (4 - (avpLength % 4));
     }
-    temp+=avpLength;  
+    temp+=avpLength;
   }
-  /* no AVP was found, returns an empty octetstring*/  
-  unsigned char noResult[0];      
+  /* no AVP was found, returns an empty octetstring*/
+  unsigned char noResult[0];
   return OCTETSTRING(0, noResult);
 }
+
 OCTETSTRING f__DIAMETER__GetAVPByListOfCodes(const OCTETSTRING& pl__oct, const integerList& pl__codeList) 
 {
   integerList glist=NULL_VALUE;
@@ -522,21 +476,17 @@ OCTETSTRING f__DIAMETER__GetAVPByListOfCodesFromGroupedAVP(const OCTETSTRING& pl
 }
 
 
-
-
-int encode_AVP_OctetString(unsigned char* & p, const AVP__OctetString& avp){ 
-  unsigned char* start=p;
+int encode_AVP_OctetString(TTCN_Buffer &p, const AVP__OctetString& avp){ 
   encode_octets(p, avp);
-  int ret_val=p-start;
   pad_oct_if_needed(p, avp.lengthof());
-  return ret_val;
+  return avp.lengthof() ;
 }
 
-int encode_AVP_Integer32(unsigned char* & p, const AVP__Integer32& avp){ 
+int encode_AVP_Integer32(TTCN_Buffer &p, const AVP__Integer32& avp){ 
   encode_signed_int_4byte(p, avp);
   return 4;
 }
-int encode_AVP_Integer64(unsigned char* & p, const AVP__Integer64& avp){
+int encode_AVP_Integer64(TTCN_Buffer &p, const AVP__Integer64& avp){
 #ifdef DPMG_USE_INTEGER_FOR_UINT32_INT64
 	encode_octets(8, p, int2oct(avp,8));
 #else
@@ -544,23 +494,15 @@ int encode_AVP_Integer64(unsigned char* & p, const AVP__Integer64& avp){
 #endif
   return 8;
 }
-int encode_AVP_Unsigned32(unsigned char* & p, const AVP__Unsigned32& avp){
+int encode_AVP_Unsigned32(TTCN_Buffer &p, const AVP__Unsigned32& avp){
 #ifdef DPMG_USE_INTEGER_FOR_UINT32_INT64
-  if(avp.is_native()){
-    const int data=avp;
-	  *(p++) = (data >> 24) & 0xFF;
-	  *(p++) = (data >> 16) & 0xFF;
-	  *(p++) = (data >> 8) & 0xFF;
-	  *(p++) = data & 0xFF;
-  } else {
-  	encode_octets(4, p, int2oct(avp,4));
-  }
+  encode_octets(4, p, int2oct(avp,4));
 #else
 	encode_octets(4, p, avp);
 #endif
   return 4;
 }
-int encode_AVP_Unsigned64(unsigned char* & p, const AVP__Unsigned64& avp){
+int encode_AVP_Unsigned64(TTCN_Buffer &p, const AVP__Unsigned64& avp){
 #ifdef DPMG_USE_INTEGER_FOR_UINT32_INT64
 	encode_octets(8, p, int2oct(avp,8));
 #else
@@ -568,8 +510,9 @@ int encode_AVP_Unsigned64(unsigned char* & p, const AVP__Unsigned64& avp){
 #endif
   return 8;
 }
-int encode_AVP_Float32(unsigned char* & p, const AVP__Float32& avp){
+int encode_AVP_Float32(TTCN_Buffer &buff, const AVP__Float32& avp){
     double tmp = avp;
+    unsigned char p[4];
     if (tmp == 0.0) memset(p, 0, 4);
     else if (tmp == -0.0) {
       memset(p, 0, 4);
@@ -612,79 +555,64 @@ int encode_AVP_Float32(unsigned char* & p, const AVP__Float32& avp){
       index += adj;
       p[3] = ((dv[index] & 0x1F) << 3) | ((dv[index + adj] & 0xE0) >> 5);
   }
-  p+=4;
+  buff.put_s(4,p);
   return 4;
 }
-int encode_AVP_Float64(unsigned char* & p, const AVP__Float64& avp){
+int encode_AVP_Float64(TTCN_Buffer &p, const AVP__Float64& avp){
   encode_float_8byte(p, avp);
   return 8;
 }
-int encode_AVP_Address(unsigned char* & p, const AVP__Address& avp){
-  unsigned char* start=p;
+int encode_AVP_Address(TTCN_Buffer &p, const AVP__Address& avp){
   encode_int_2byte(p,avp.address__type());
   encode_octets(p, avp.address__data());
-  int ret_val=p-start;
   pad_oct_if_needed(p, avp.address__data().lengthof()+2);
-  return ret_val;
+  return avp.address__data().lengthof()+2;
 }
-int encode_AVP_IP_Address(unsigned char* & p, const AVP__IP__Address& avp){
-  unsigned char* start=p;
+int encode_AVP_IP_Address(TTCN_Buffer &p, const AVP__IP__Address& avp){
   encode_octets(p, avp);
-  int ret_val=p-start;
   pad_oct_if_needed(p, avp.lengthof());
-  return ret_val;
+  return avp.lengthof();
 }
-int encode_AVP_Time(unsigned char* & p, const AVP__Time& avp){
+int encode_AVP_Time(TTCN_Buffer &p, const AVP__Time& avp){
   encode_octets(4,p, avp);
   return 4;
 }
-int encode_AVP_UTF8String(unsigned char* & p, const AVP__UTF8String& avp){
+int encode_AVP_UTF8String(TTCN_Buffer &p, const AVP__UTF8String& avp){
 #ifdef DPMG_USE_UTF8_ENC 
    TTCN_Buffer buf;    
    avp.encode_utf8(buf);
    int length = buf.get_len();
-   memcpy(p,buf.get_data(),length); 
-   p += length;
+   p.put_buf(buf);
    pad_oct_if_needed(p, length);   
    return length;       
 #else 
-  unsigned char* start=p;
   encode_octets(p, avp);
-  int ret_val=p-start;
   pad_oct_if_needed(p, avp.lengthof());
-  return ret_val;
+  return avp.lengthof();
 #endif    
   
 }
-int encode_AVP_DiameterIdentity(unsigned char* & p, const AVP__DiameterIdentity& avp){
-  unsigned char* start=p;
+int encode_AVP_DiameterIdentity(TTCN_Buffer &p, const AVP__DiameterIdentity& avp){
   encode_chars(p, avp);
-  int ret_val=p-start;
   pad_oct_if_needed(p, avp.lengthof());
-  return ret_val;
+  return avp.lengthof();
 }
-int encode_AVP_DiameterURI(unsigned char* & p, const AVP__DiameterURI& avp){
-  unsigned char* start=p;
+int encode_AVP_DiameterURI(TTCN_Buffer &p, const AVP__DiameterURI& avp){
   encode_chars(p, avp);
-  int ret_val=p-start;
   pad_oct_if_needed(p, avp.lengthof());
-  return ret_val;
+  return avp.lengthof();
 }
-int encode_AVP_IPFilterRule(unsigned char* & p, const AVP__IPFilterRule& avp){
-  unsigned char* start=p;
+int encode_AVP_IPFilterRule(TTCN_Buffer &p, const AVP__IPFilterRule& avp){
   encode_chars(p, avp);
-  int ret_val=p-start;
   pad_oct_if_needed(p, avp.lengthof());
-  return ret_val;
+  return avp.lengthof();
 }
-int encode_AVP_QoSFilterRule(unsigned char* & p, const AVP__QoSFilterRule& avp){
-  unsigned char* start=p;
+int encode_AVP_QoSFilterRule(TTCN_Buffer &p, const AVP__QoSFilterRule& avp){
   encode_chars(p, avp);
-  int ret_val=p-start;
   pad_oct_if_needed(p, avp.lengthof());
-  return ret_val;
+  return avp.lengthof();
 }
-int encode_AVP_enumerated(unsigned char* & p, const int& avp){
+int encode_AVP_enumerated(TTCN_Buffer &p, const int& avp){
   encode_int_4byte(p, avp);
   return 4;
 }
diff --git a/src/DOIC_RFC7683.ddf b/src/DOIC_RFC7683.ddf
new file mode 100644
index 0000000000000000000000000000000000000000..66fb5894885d026a1db66e1cf1893194076d8728
--- /dev/null
+++ b/src/DOIC_RFC7683.ddf
@@ -0,0 +1,61 @@
+/******************************************************************************
+* Copyright (c) 2004, 2018  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:               DOIC_RFC7683.ddf
+//  Description:        DDF for Diameter Overload Indication Conveyance AVPs
+//  Rev:                R55A
+//  Prodnr:             CNL 113 462
+///////////////////////////////////////////////
+
+// APPLICATION-NAME: DOIC
+// APPLICATION-REVISION: RFC7683
+
+// AVP implementations according to: 
+// RFC7683 - Diameter Overload Indication Conveyance
+//
+// RFC 7683
+// 7.1.
+// AVP: OC-Supported-Features (621)
+type AVP_Grouped OC_Supported_Features;
+
+// RFC 7683
+// 7.2.
+// AVP: OC-Feature-Vector (622)
+type AVP_Unsigned64 OC_Feature_Vector;
+
+// RFC 7683
+// 7.3.
+// AVP: OC-OLR (623)
+type AVP_Grouped OC_OLR;
+
+// RFC 7683
+// 7.4.
+// AVP: OC-Sequence-Number (624)
+type AVP_Unsigned64 OC_Sequence_Number;
+
+// RFC 7683
+// 7.5.
+// AVP: OC-Validity-Duration (625)
+type AVP_Unsigned32 OC_Validity_Duration;
+
+// RFC 7683
+// 7.6.
+// AVP: OC-Report-Type (626)
+type enumerated OC_Report_Type
+{
+  HOST_REPORT  (0),
+  REALM_REPORT (1)
+}
+
+// RFC 7683
+// 7.7.
+// AVP: OC-Reduction-Percentage (627)
+type AVP_Unsigned32 OC_Reduction_Percentage;
\ No newline at end of file
diff --git a/src/DelegatedIPv6Prefix_IETF_RFC4818.ddf b/src/DelegatedIPv6Prefix_IETF_RFC4818.ddf
index ad23056f804151780042b0494203882599db12d5..f8a706bf02bbe3bf70efd891790a0b47b18d227d 100644
--- a/src/DelegatedIPv6Prefix_IETF_RFC4818.ddf
+++ b/src/DelegatedIPv6Prefix_IETF_RFC4818.ddf
@@ -11,7 +11,7 @@
 //
 //  File:               DelegatedIPv6Prefix_IETF_RFC4818.ddf
 //  Description:        DDF for Delegated IPv6 Prefix to RFC 4818
-//  Rev:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL113462
 ///////////////////////////////////////////////
 
diff --git a/src/DiameterRoutingMessagePriority_IETF_RFC7944.ddf b/src/DiameterRoutingMessagePriority_IETF_RFC7944.ddf
new file mode 100644
index 0000000000000000000000000000000000000000..213f799e8217b03f0920af73a039bd9aab8d39be
--- /dev/null
+++ b/src/DiameterRoutingMessagePriority_IETF_RFC7944.ddf
@@ -0,0 +1,46 @@
+/******************************************************************************
+* Copyright (c) 2004, 2017  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:               DiameterRoutingMessagePriority_IETF_RFC7944.ddf
+//  Description:        DDF for Diameter Routing Message Priority according to RFC7944
+//  Rev:                R55A
+//  Prodnr:             CNL 113 462
+///////////////////////////////////////////////
+
+
+// APPLICATION-NAME: DRMP
+// APPLICATION-REVISION: RFC7944
+
+// AVP implementations according to: 
+// RFC7944 - Diameter Routing Message Priority
+//
+// RFC 7944 
+// 9.
+// AVP: DRMP (301)
+type enumerated DRMP
+{
+  PRIORITY_0   (0),
+  PRIORITY_1   (1),
+  PRIORITY_2   (2),
+  PRIORITY_3   (3),
+  PRIORITY_4   (4),
+  PRIORITY_5   (5),
+  PRIORITY_6   (6),
+  PRIORITY_7   (7),
+  PRIORITY_8   (8),
+  PRIORITY_9   (9),
+  PRIORITY_10  (10),
+  PRIORITY_11  (11),
+  PRIORITY_12  (12),
+  PRIORITY_13  (13),
+  PRIORITY_14  (14),
+  PRIORITY_15  (15)
+}
diff --git a/src/DigestAuthentication_IETF_RFC5090.ddf b/src/DigestAuthentication_IETF_RFC5090.ddf
index 3eb057dd2170a70ad3f4a1a6279795f55e59e6e0..44acf308c0bb11a49be442de2427b5071e64f5e5 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 1134 62
 ///////////////////////////////////////////////
 
diff --git a/src/EricssonSCAPv1_1553APR_10148.ddf b/src/EricssonSCAPv1_1553APR_10148.ddf
index e4fd038fe247a6320d86dddd527769c8ca78bc26..cee4879038d086da44a375c734d16f64781472b9 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/Ericsson_Specific_AVPs.ddf b/src/Ericsson_Specific_AVPs.ddf
index 4eb8b5541e1a01068e13161da9936e2781831dab..81d798828cb8c9dac9888bd0979503cc758f80c2 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 //  Reference:          http://snmp.ericsson.se/diameter-assignments.html
 //
@@ -54,6 +54,12 @@ type enumerated Command_Code {
   User_Data_Ericsson          (502),       // User-Data-Request (UDR) or User-Data-Answer (UDA)
   Location_Info_Ericsson      (503),       // Location-Info-Request (LIR) or Location-Info-Answer (LIA)
   Multimedia_Auth_Ericsson    (506),       // Multimedia-Auth-Request (MAR) or Multimedia-Auth-Answer (MAA)
+  Update_Location_Ericsson    (650),
+  Authentication_Information_Ericsson  (651),
+  Insertsubscriber_Data_Ericsson       (652),
+  Cancel_Location_Ericsson             (653),
+  Purge_UE_Ericsson                    (654),
+  System_Information_Ericsson          (655),      
   Spending_Limit_Official                     (656),
   Spending_Status_Notification_Official       (657),  
   Spending_Limit                              (8388633),
@@ -2685,6 +2691,146 @@ type AVP_OctetString Additional_User_Category
 type AVP_OctetString Flexible_Charging_Info
 
 
+// AVP: Original-Transferred-Amount (1400) Ericsson (193)
+type AVP_Grouped Original_Transferred_Amount
+
+
+// AVP: Original-Fee (1401) Ericsson (193)
+type AVP_Grouped Original_Fee
+
+
+// AVP: Transaction-Role (1402) Ericsson (193)
+type AVP_Unsigned32 Transaction_Role
+
+
+// AVP: Charging-Region (1403) Ericsson (193)
+type AVP_UTF8String Charging_Region
+
+
+// AVP: Used-Offer-Id (1404) Ericsson (193)
+type AVP_Unsigned32 Used_Offer_Id
+
+
+// AVP: Forward-TTC-Charging-Parameters (1406) Ericsson (193)
+type AVP_UTF8String Forward_TTC_Charging_Parameters
+
+
+// AVP: Backward-TTC-Charging-Parameters (1407) Ericsson (193)
+type AVP_UTF8String Backward_TTC_Charging_Parameters 
+
+
+// AVP: Synchronization-Data (1408) Ericsson (193)
+type AVP_Grouped Synchronization_Data
+
+
+// AVP: Session-Binding-Function (1409) Ericsson (193)
+type enumerated Session_Binding_Function
+{
+  INITIALIZE (0),
+  TERMINATE  (1),
+  BIND (2)
+}
+
+
+// AVP: Binding-Info (1410) Ericsson (193)
+type AVP_Grouped Binding_Info
+
+
+// AVP: Session-Info (1411) Ericsson (193)
+type AVP_Grouped Session_Info
+
+
+// AVP: Binding-Key (1412) Ericsson (193)
+type AVP_OctetString Binding_Key
+
+
+// AVP: First-Request-Timestamp (1413) Ericsson (193)
+type AVP_Unsigned64 First_Request_Timestamp
+
+
+// AVP: Selected-Server (1414) Ericsson (193)
+type AVP_DiameterIdentity Selected_Server
+
+
+// AVP: Session-Binding-Profile (1415) Ericsson (193)
+type AVP_Grouped Session_Binding_Profile
+
+
+// AVP: Profile-Name (1416) Ericsson (193)
+type AVP_UTF8String Profile_Name
+
+
+// AVP: Profile-Data (1417) Ericsson (193)
+type AVP_OctetString Profile_Data
+
+
+// AVP: Session-Client (1418) Ericsson (193)
+type AVP_DiameterIdentity Session_Client
+
+
+// AVP: Session-Client-Origin-State-Id (1419) Ericsson (193)
+type AVP_Unsigned32 Session_Client_Origin_State_Id
+
+
+// AVP: Session-Server (1420) Ericsson (193)
+type AVP_DiameterIdentity Session_Server
+
+
+// AVP: Session-Server-Origin-State-Id (1421) Ericsson (193)
+type AVP_Unsigned32 Session_Server_Origin_State_Id
+
+
+// AVP: Last-Session-Activity-Timestamp (1422) Ericsson (193)
+type AVP_Unsigned64 Last_Session_Activity_Timestamp
+
+
+// AVP: Mated-DSC (1423) Ericsson (193)
+type AVP_Grouped Mated_DSC
+
+
+// AVP: Additional-Service-Information (1424) Ericsson (193)
+type AVP_Grouped Additional_Service_Information
+
+
+// AVP: Additional-Service-Information-Name (1425) Ericsson (193)
+type AVP_UTF8String Additional_Service_Information_Name
+
+
+// AVP: Additional-Service-Information-Type (1426) Ericsson (193)
+type AVP_UTF8String Additional_Service_Information_Type
+
+
+// AVP: Additional-Service-Information-Value (1427) Ericsson (193)
+type AVP_UTF8String Additional_Service_Information_Value
+
+
+// AVP: Mate-Hostname (1428) Ericsson (193)
+type AVP_DiameterIdentity Mate_Hostname
+
+
+// AVP: Mate-DMI-Session-Binding-Result (1429) Ericsson (193)
+type enumerated Mate_DMI_Session_Binding_Result
+{
+  No_DMI  (0),
+  Success (1),
+  Failure (2),
+  Drop    (3),
+  Reject  (4),
+  ForwardToMate (5)
+}
+
+
+// AVP: ISUP-Cause-Location (1430) Ericsson (193)
+type AVP_Unsigned32 ISUP_Cause_Location
+
+
+// AVP: ISUP-Cause-Value (1431) Ericsson (193)
+type AVP_Unsigned32 ISUP_Cause_Value
+
+
+// AVP: ISUP-Cause (1432) Ericsson (193)
+type AVP_Grouped ISUP_Cause
+
 
 // AVP: AS-Type (1433) Ericsson (193)
 type enumerated AS_Type
@@ -2698,3 +2844,158 @@ type enumerated AS_Type
 }
 
 
+// AVP: Number-Of-Days-Since-Activation (1434) Ericsson (193)
+type AVP_Unsigned32 Number_Of_Days_Since_Activation
+
+
+// AVP: Re-Routing-Address (1435) Ericsson (193)
+type AVP_Grouped Re_Routing_Address
+
+
+// AVP: Last-Access-Network-Information (1436) Ericsson (193)
+type AVP_OctetString Last_Access_Network_Information
+
+
+// AVP: Successive-Call (1437) Ericsson (193)
+type AVP_OctetString Successive_Call
+
+
+// AVP: Other-Party-Id-Prefix (1438) Ericsson (193)
+type AVP_UTF8String Other_Party_Id_Prefix
+
+
+// AVP: Ericsson-Requested-Data (1439) Ericsson (193)
+type enumerated Ericsson_Requested_Data
+{
+  IRS_Data (0)
+}
+
+
+// AVP: Ext-Bearer-Service-Code (1440) Ericsson (193)
+type AVP_Unsigned32 Ext_Bearer_Service_Code
+
+
+// AVP: Announcement-Instructions (1441) Ericsson (193)
+type AVP_Grouped Announcement_Instructions
+
+
+// AVP: Announcement-Number (1442) Ericsson (193)
+type AVP_Unsigned32 Announcement_Number
+
+
+// AVP: Announcement-Order (1443) Ericsson (193)
+type AVP_Unsigned32 Announcement_Order
+
+
+// AVP: Announcement-Prompt-Collect-Interruptible (1444) Ericsson (193)
+type enumerated Announcement_Prompt_Collect_Interruptible
+{
+  FALSE (0),
+  TRUE  (1)
+}
+
+
+// AVP: Announcement-Prompt-Collect-MaxDigits (1445) Ericsson (193)
+type AVP_Unsigned32 Announcement_Prompt_Collect_MaxDigits
+
+
+// AVP: Announcement-Prompt-Collect-MinDigits (1446) Ericsson (193)
+type AVP_Unsigned32 Announcement_Prompt_Collect_MinDigits
+
+
+// AVP: Announcement-Prompt-Collect-Parameter (1447) Ericsson (193)
+type AVP_Grouped Announcement_Prompt_Collect_Parameter
+
+
+// AVP: Announcement-Type (1448) Ericsson (193)
+type AVP_Unsigned32 Announcement_Type
+
+
+// AVP: Announcement-Variable-Part (1449) Ericsson (193)
+type AVP_Grouped Announcement_Variable_Part
+
+
+// AVP: Announcement-Variable-Part-Data (1450) Ericsson (193)
+type AVP_UTF8String Announcement_Variable_Part_Data
+
+
+// AVP: Announcement-Variable-Part-Type (1451) Ericsson (193)
+type enumerated Announcement_Variable_Part_Type
+{
+  INTEGER (0),
+  NUMBER  (1),
+  TIME    (2),
+  DATE    (3),
+  PRICE   (4)
+}
+
+
+// AVP: Trace-Report (1452) Ericsson (193)
+type AVP_Grouped Trace_Report
+
+
+// AVP: Trace-Report-Type (1453) Ericsson (193)
+type enumerated Trace_Report_Type
+{
+  TRACE_STATE_UPDATE (0),
+  TRACE_SESSION_INFO (1),
+  TRACE_DATA_REPORT  (2)
+}
+
+
+// AVP: Trace-Profile (1454) Ericsson (193)
+type AVP_Grouped Trace_Profile
+
+
+// AVP: Trace-Name (1455) Ericsson (193)
+type AVP_UTF8String Trace_Name
+
+
+// AVP: Trace-Pattern (1456) Ericsson (193)
+type AVP_UTF8String Trace_Pattern
+
+
+// AVP: Trace-Duration (1457) Ericsson (193)
+type AVP_Unsigned32 Trace_Duration
+
+
+// AVP: Tracing-State (1458) Ericsson (193)
+type enumerated Tracing_State
+{
+  INACTIVE (0),
+  ACTIVE   (1)
+}
+
+
+// AVP: Trace-Data (1459) Ericsson (193)
+type AVP_UTF8String Trace_Data
+
+
+// AVP: Transaction-SIP-Message (1460) Ericsson (193)
+type AVP_UTF8String Transaction_SIP_Message
+
+
+// AVP: Ericsson-Access-Classification-Location (1461) Ericsson (193)
+type AVP_OctetString Ericsson_Access_Classification_Location
+
+
+// AVP: Additional-Subscription-Id-Information (1462) Ericsson (193)
+type AVP_Grouped Additional_Subscription_Id_Information
+
+
+// AVP: Subscriber-Type (1463) Ericsson (193)
+type enumerated Subscriber_Type
+{
+  BUSINESS (0)
+}
+
+
+// AVP: UC-Mobility-Call-Leg (1464) Ericsson (193)
+type enumerated UC_Mobility_Call_Leg
+{
+  ORIGINATING_ACCESS  (0),
+  TERMINATING_TRUNK   (1),
+  TERMINATING_CONNECT (2)
+}
+
+
diff --git a/src/ExtensibleAuthenticationProtocol_IETF_RFC4072.ddf b/src/ExtensibleAuthenticationProtocol_IETF_RFC4072.ddf
index 7340bc805633d2955684f8803746045c277b5af1..ee39725059b1c59ee5233a4cb575631415d2a0cf 100644
--- a/src/ExtensibleAuthenticationProtocol_IETF_RFC4072.ddf
+++ b/src/ExtensibleAuthenticationProtocol_IETF_RFC4072.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               ExensibleAuthenticationProtocol_IETF_RFC4072.ddf
 //  Description:        DDF for EAP according to RFC 4072
-//  Rev:                RXXA0X
+//  Rev:                R55A
 //  Prodnr:             CNL113462
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/GiInterface_3GPP_TS29061_770.ddf b/src/GiInterface_3GPP_TS29061_770.ddf
index ee73d6decdb714a116f51d1e0a74d7a7696df82f..aff653c75e157e41453b4b248cc871e063dbebe6 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/GiSGiInterface_3GPP_TS29061_810.ddf b/src/GiSGiInterface_3GPP_TS29061_810.ddf
index de2d0a0039b010edc331645178c5292252158edd..40d52bbf816050d2910f79f90cf7def6cf91d457 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/GiSGiInterface_3GPP_TS29061_930.ddf b/src/GiSGiInterface_3GPP_TS29061_930.ddf
index b235ed574cde9d94f71908a1178577adbb85bc64..603651edaf5955424594854d4a4e1a2ed8cf4f2c 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:                R40A
+//  Rev:                R55A
 //  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 2c66d7d396ece8ffefa9d44ebdc76fe71acf1088..82b8d2e8a42f11844b6118a04eb57c8df3e4e2a0 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:                R40A
+//  Rev:                R17A01
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/GiSGiInterface_3GPP_TS29061_980.ddf b/src/GiSGiInterface_3GPP_TS29061_980.ddf
index bb1b03848fbdd9899ccb2acbcdb2ebb9add8b97f..e4de48fc8d97137943762655df1540a934f07d87 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/GiSGiInterface_3GPP_TS29061_b90.ddf b/src/GiSGiInterface_3GPP_TS29061_b90.ddf
index e0806aa86648be43a5c72e1c86192ad98b53cc3f..6327686012f89b30f0e3ab5c8513b10de3ebc6d5 100644
--- a/src/GiSGiInterface_3GPP_TS29061_b90.ddf
+++ b/src/GiSGiInterface_3GPP_TS29061_b90.ddf
@@ -11,7 +11,7 @@
 //
 //  File:               GiSGiInterface_3GPP_TS29061_b90.ddf
 //  Description:        DDF for Gi/SGi according to 3GPP TS 29.061 V11.9.0
-//  Rev:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/GiSGiInterface_3GPP_TS29061_b90_QoS_Detailed.ddf b/src/GiSGiInterface_3GPP_TS29061_b90_QoS_Detailed.ddf
index fdaf251ce61b34d8a08b4cc69e77bb63dc96dacb..5edee895ff0415111fc6ec6b1b4556fafd356b71 100644
--- a/src/GiSGiInterface_3GPP_TS29061_b90_QoS_Detailed.ddf
+++ b/src/GiSGiInterface_3GPP_TS29061_b90_QoS_Detailed.ddf
@@ -11,7 +11,7 @@
 //
 //  File:               GiSGiInterface_3GPP_TS29061_b90_QoS_Detailed.ddf
 //  Description:        DDF for Gi/SGi according to 3GPP TS 29.061 V11.9.0
-//  Rev:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/GiSGiInterface_3GPP_TS29061_d70.ddf b/src/GiSGiInterface_3GPP_TS29061_d70.ddf
new file mode 100644
index 0000000000000000000000000000000000000000..a33e83d8b79b4d2e56baa3fa2eab5921ca08bf61
--- /dev/null
+++ b/src/GiSGiInterface_3GPP_TS29061_d70.ddf
@@ -0,0 +1,220 @@
+/******************************************************************************
+* Copyright (c) 2004, 2017  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:
+*   Máté Kovács
+******************************************************************************/
+//
+//  File:               GiSGiInterface_3GPP_TS29061_d70.ddf
+//  Description:        DDF for Gi/SGi according to 3GPP TS 29.061 V13.7.0
+//  Rev:                R55A
+//  Prodnr:             CNL 113 462
+///////////////////////////////////////////////
+
+
+// APPLICATION-NAME: GI
+// APPLICATION-REVISION: V13_7_0
+
+// AVP implementations according to: 
+// 3GPP TS 29.061 V13.7.0 - Interworking between the Public Land Mobile Network (PLMN) supporting packet based services and Packet Data Networks (PDN)
+//
+//
+// Dependant applications
+// -
+
+
+// 3GPP TS 29.061 V13.7.0 16a.4
+type enumerated Command_Code 
+{
+  Authorize_Authenticate (265),
+  Session_Termination    (275),
+  Abort_Session          (274),
+  Accounting             (271)
+}
+
+
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: 3GPP-IMSI (1) 3GPP (10415)
+// 16.4.7
+type AVP_UTF8String 3GPP_IMSI;
+
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: 3GPP-Charging-Id (2) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString 3GPP_Charging_Id;
+
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: 3GPP-PDP-Type (3) 3GPP (10415)
+// 16.4.7
+type enumerated 3GPP_PDP_Type
+{
+  IPv4   (0),
+  PPP    (1),
+  IPv6   (2),
+  IPv4v6 (3),
+  NonIp  (4)
+}
+
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: 3GPP-CG-Address (4) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString 3GPP_CG_Address;
+
+
+// 3GPP TS 29.061 V13.7.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 V13.7.0
+// AVP: 3GPP-SGSN-Address (6) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString 3GPP_SGSN_Address;
+
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: 3GPP-GGSN-Address (7) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString 3GPP_GGSN_Address;
+
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: 3GPP-IMSI-MCC-MNC (8) 3GPP (10415)
+// 16.4.7
+type AVP_UTF8String 3GPP_IMSI_MCC_MNC;
+
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: 3GPP-GGSN-MCC-MNC (9) 3GPP (10415)
+// 16.4.7
+type AVP_UTF8String 3GPP_GGSN_MCC_MNC;
+
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: 3GPP-NSAPI (10) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString 3GPP_NSAPI;
+
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: 3GPP-Session-Stop-Indicator (11) 3GPP (10415)
+type AVP_UTF8String 3GPP_Session_Stop_Indicator;
+
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: 3GPP-Selection-Mode (12) 3GPP (10415)
+// 16.4.7
+type AVP_UTF8String 3GPP_Selection_Mode;
+
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: 3GPP-Charging-Characteristics (13) 3GPP (10415)
+// 16.4.7
+type AVP_UTF8String 3GPP_Charging_Characteristics;
+
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: 3GPP-CG-IPv6-Address (14) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString 3GPP_CG_IPv6_Address;
+
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: 3GPP-SGSN-IPv6-Address (15) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString 3GPP_SGSN_IPv6_Address;
+
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: 3GPP-GGSN-IPv6-Address (16) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString 3GPP_GGSN_IPv6_Address;
+
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: 3GPP-IPv6-DNS-Servers (17) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString 3GPP_IPv6_DNS_Servers;
+
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: 3GPP-SGSN-MCC-MNC (18) 3GPP (10415)
+// 16.4.7
+type AVP_UTF8String 3GPP_SGSN_MCC_MNC;
+
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: 3GPP-IMEISV (20) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString 3GPP_IMEISV;
+
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: 3GPP-RAT-Type (21) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString 3GPP_RAT_Type;
+
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: 3GPP-User-Location-Info (22) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString 3GPP_User_Location_Info;
+
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: 3GPP-MS-TimeZone (23) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString 3GPP_MS_TimeZone;
+
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: 3GPP-CAMEL-Charging-Info (24) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString 3GPP_CAMEL_Charging_Info;
+
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: 3GPP-Packet-Filter (25) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString 3GPP_Packet_Filter;
+
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: 3GPP-Negotiated-DSCP (26) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString 3GPP_Negotiated_DSCP;
+
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: 3GPP-Allocate-IP-Type (27) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString 3GPP_Allocate_IP_Type;
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: External-Identifier (28) 3GPP (10415)
+// 16.4.7
+type AVP_UTF8String External_Identifier;
+
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: TWAN-Identifier (29) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString TWAN_Identifier;
+
+
+// 3GPP TS 29.061 V13.7.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 1278a1d6a60148c900b611c80c4e497a2159aa70..a27b8d6470d28a3a902ad086dc04df4cc003097b 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/GmbInterface_3GPP_TS29061_720.ddf b/src/GmbInterface_3GPP_TS29061_720.ddf
index 86e2f344351f4f3a81338c997942166e21d12c32..19767d6e13a02c6bad0b6ff8b428ebb0df831538 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/GmbInterface_3GPP_TS29061_810.ddf b/src/GmbInterface_3GPP_TS29061_810.ddf
index e4f54b493c080d0105f8e1c22082cb288fb78fc5..facf2e1911012636f585e5090a165a980815caed 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/GmbInterface_3GPP_TS29061_930.ddf b/src/GmbInterface_3GPP_TS29061_930.ddf
index 52d239f25500878fa06ccc33ecf52b02d6485469..386b4d3a1cdd4e4110c5d3f1954477c76a1faafa 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/GmbInterface_3GPP_TS29061_970.ddf b/src/GmbInterface_3GPP_TS29061_970.ddf
index 709913f4845ebd4498f3f0e14af04daa679be379..5b3d411c1dc3ee7851322cda77df63ab5c5cd44d 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/GmbInterface_3GPP_TS29061_980.ddf b/src/GmbInterface_3GPP_TS29061_980.ddf
index f3319a59f1f16ba81783c11da8f9994c93dc2998..2efef1d898da5da4dcd9be36b885a0925ceb0efc 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/GmbInterface_3GPP_TS29061_d70.ddf b/src/GmbInterface_3GPP_TS29061_d70.ddf
new file mode 100644
index 0000000000000000000000000000000000000000..fbfbf82bf87adb1d5f5ba813ddf5f3ced7b90f09
--- /dev/null
+++ b/src/GmbInterface_3GPP_TS29061_d70.ddf
@@ -0,0 +1,224 @@
+/******************************************************************************
+* Copyright (c) 2004, 2017  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:
+*   Máté Kovács
+******************************************************************************/
+//
+//  File:               GmbInterface_3GPP_TS29061_d70.ddf
+//  Description:        DDF for Gmb according to 3GPP TS 29.061 V13.7.0
+//  Rev:                R55A
+//  Prodnr:             CNL 113 462
+///////////////////////////////////////////////
+
+
+// APPLICATION-NAME: GMB
+// APPLICATION-REVISION: V13_7_0
+
+// AVP implementations according to: 
+// 3GPP TS 29.061 V13.7.0 - Interworking between the Public Land Mobile Network 
+// (PLMN) supporting packet based services and Packet Data Networks (PDN)
+//
+//
+// Dependant applications
+// IETF RFC 3588  - Diameter Base Protocol
+// IETF RFC 4005  - Diameter Network Address Server
+//
+// Notes: 
+// Present application has its own vendor specific Diameter application id: 16777223
+//
+
+// 3GPP TS 29.061 V13.7.0 17.6
+type enumerated Command_Code 
+{
+  Authorize_Authenticate (265),
+  Re_Auth                (258),
+  Session_Termination    (275),
+  Abort_Session          (274)
+}
+
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: TMGI (900) 3GPP (10415)
+// 17.7.2
+type AVP_OctetString TMGI;
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: Required-MBMS-Bearer-Capabilities (901) 3GPP (10415)
+// 17.7.3
+type AVP_UTF8String Required_MBMS_Bearer_Capabilities;
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: MBMS-StartStop-Indication (902) 3GPP (10415)
+// 17.7.5
+type enumerated MBMS_StartStop_Indication
+{
+  START              (0),
+  STOP               (1),
+  UPDATE             (2),
+  HEARTBEAT          (3)
+}
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: MBMS-Service-Area (903) 3GPP (10415)
+// 17.7.6
+type AVP_OctetString MBMS_Service_Area;
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: MBMS-Session-Duration (904) 3GPP (10415)
+// 17.7.7
+type AVP_OctetString MBMS_Session_Duration;
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: 3GPP-IMSI (1) 3GPP (10415)
+// 16.4.7
+type AVP_UTF8String 3GPP_IMSI;
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: Alternative-APN (905) 3GPP (10415)
+// 17.7.8
+type AVP_UTF8String Alternative_APN;
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: MBMS-Service-Type (906) 3GPP (10415)
+// 17.7.9
+type enumerated MBMS_Service_Type
+{
+  MULTICAST              (0),
+  BROADCAST              (1)
+}
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: 3GPP-SGSN-Address (6) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString 3GPP_SGSN_Address;
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: 3GPP-SGSN-IPv6-Address (15) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString 3GPP_SGSN_IPv6_Address;
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: MBMS-2G-3G-Indicator (907) 3GPP (10415)
+// 17.7.10
+type enumerated MBMS_2G_3G_Indicator
+{
+  TwoG                    (0),
+  ThreeG                  (1),
+  TwoG_AND_ThreeG         (2)
+}
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: MBMS-Session-Identity (908) 3GPP (10415)
+// 17.7.11
+type AVP_OctetString MBMS_Session_Identity;
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: RAI (909) 3GPP (10415)
+// 17.7.12
+type AVP_UTF8String RAI;
+
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: 3GPP-IMEISV (20) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString 3GPP_IMEISV;
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: 3GPP-RAT-Type (21) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString 3GPP_RAT_Type;
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: 3GPP-User-Location-Info (22) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString 3GPP_User_Location_Info;
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: 3GPP-MS-TimeZone (23) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString 3GPP_MS_TimeZone;
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: Additional-MBMS-Trace-Info (910) 3GPP (10415)
+// 17.7.13
+type AVP_OctetString Additional_MBMS_Trace_Info;
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: MBMS-Time-To-Data-Transfer (911) 3GPP (10415)
+// 17.7.14
+type AVP_OctetString MBMS_Time_To_Data_Transfer;
+
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: MBMS-Session-Repetition-Number (912) 3GPP (10415)
+// 17.7.15
+type AVP_OctetString MBMS_Session_Repetition_Number;
+
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: MBMS-Required-QoS (913) 3GPP (10415)
+// 17.7.16
+type AVP_UTF8String MBMS_Required_QoS;
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: MBMS-Counting-Information (914) 3GPP (10415)
+// 17.7.17
+type enumerated MBMS_Counting_Information
+{
+  COUNTING_NOT_APPLICABLE              (0),
+  COUNTING_APPLICABLE                  (1)
+}
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: MBMS-User-Data-Mode-Indication (915) 3GPP (10415)
+// 17.7.18
+type enumerated MBMS_User_Data_Mode_Indication
+{
+  Unicast                (0),
+  Multicast_and_Unicast  (1)
+}
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: MBMS-GGSN-Address (916) 3GPP (10415)
+// 17.7.19
+type AVP_OctetString MBMS_GGSN_Address;
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: MBMS-GGSN-IPv6-Address (917) 3GPP (10415)
+// 17.7.20
+type AVP_OctetString MBMS_GGSN_IPv6_Address;
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: MBMS-BMSC-SSM-IP-Address (918) 3GPP (10415)
+// 17.7.21
+type AVP_OctetString MBMS_BMSC_SSM_IP_Address;
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: MBMS-BMSC-SSM-IPv6-Address (919) 3GPP (10415)
+// 17.7.22
+type AVP_OctetString MBMS_BMSC_SSM_IPv6_Address;
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: MBMS-Flow-Identifier (920) 3GPP (10415)
+// 17.7.23
+type AVP_OctetString MBMS_Flow_Identifier;
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: CN-IP-Multicast-Distribution (921) 3GPP (10415)
+// 17.7.24
+type enumerated CN_IP_Multicast_Distribution
+{
+  NO_IP_MULTICAST (0),
+  IP_MULTICAST    (1)
+}
+
+// WARNING: Unsigned32 used instead of enumerated type
+// 3GPP TS 29.061 V13.7.0
+// AVP: MBMS-HC-Indicator (922) 3GPP (10415)
+// 17.7.25
+type AVP_Unsigned32 MBMS_HC_Indicator;
diff --git a/src/GqInterface_PC_3GPP_TS29209_670.ddf b/src/GqInterface_PC_3GPP_TS29209_670.ddf
index 51cfb97d574d248cda6821bd765287930e32cffb..6d48feda0409fcc28f3f5654ead53903960ae0d7 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/GqInterface_S3_ETSI_TS183017_231.ddf b/src/GqInterface_S3_ETSI_TS183017_231.ddf
index 861351d99f1741cd44cb45b89746209677d6e04e..a60aa61019b61829c7090c32dc719c59c2aa5e0e 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/GxInterface_CRP_3GPP_TS29210_670.ddf b/src/GxInterface_CRP_3GPP_TS29210_670.ddf
index 1d36e68cd446ee6a777a42887c537f3832a64913..6b5f7767ed7f4b8ca59e3aee72ec38fb78d442e3 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/GxInterface_PCC_3GPP_TS29212_740.ddf b/src/GxInterface_PCC_3GPP_TS29212_740.ddf
index ee4685e030feb8f87b9651049e9bf83f9c9cf54e..45b7508f14f517d6a5581ad6c13c0fce75e582c6 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/GxInterface_PCC_3GPP_TS29212_820.ddf b/src/GxInterface_PCC_3GPP_TS29212_820.ddf
index ce1ee45c76a2256d85655357e209dbb946f50ac8..40de8d4f0ca782183ef08a4456e20a219a05ccf9 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/GxInterface_PCC_3GPP_TS29212_830.ddf b/src/GxInterface_PCC_3GPP_TS29212_830.ddf
index 34e38510891ce3705595155b680e8fea706d3b2b..94d1fbadc01408c9736eba76c14bff47f6d0e785 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/GxInterface_PCC_3GPP_TS29212_840.ddf b/src/GxInterface_PCC_3GPP_TS29212_840.ddf
index bf2990061a2c76f07ce79512e173875e95bd4058..de848a1dba95a006110f338ef9a547f93ed0e03d 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/GxInterface_PCC_3GPP_TS29212_8a0.ddf b/src/GxInterface_PCC_3GPP_TS29212_8a0.ddf
index 3186603a1dd9823e731e88fae6670b50c55c6355..afbcd6f23a8930b5850506a070fc7e474e5aad30 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/GxInterface_PCC_3GPP_TS29212_8b1.ddf b/src/GxInterface_PCC_3GPP_TS29212_8b1.ddf
index 657c4f272523b88be77eebc7d47480596619cd41..b8bc3c7cd6c0734493b0ec3015aaf8efa550afcf 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/GxInterface_PCC_3GPP_TS29212_910.ddf b/src/GxInterface_PCC_3GPP_TS29212_910.ddf
index 4ad631b3216eaf0b1cf5745a524b24344dd30563..bca43e3aacdf65b68b4c8c67951fe430f2b9d1a6 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/GxInterface_PCC_3GPP_TS29212_930.ddf b/src/GxInterface_PCC_3GPP_TS29212_930.ddf
index 242e88d65d3a8bde639e5198c46f5fec8b04a50b..98e8f718fcf86ff32ee4d2fa86444beb73bb4391 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/GxInterface_PCC_3GPP_TS29212_970.ddf b/src/GxInterface_PCC_3GPP_TS29212_970.ddf
index b5f9bdaacbf9f590a1cef6db032b7c29f0965e52..fd832eaf271d0c2fb7a92cd2271bf1421963f8d6 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/GxInterface_PCC_3GPP_TS29212_9b0.ddf b/src/GxInterface_PCC_3GPP_TS29212_9b0.ddf
index 3612fcdbdf44f5fd90d01b07e968abd7f0f298fd..4088edf738ecba935361c10f9a3a6df35b9ba345 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/GxInterface_PCC_3GPP_TS29212_aa0.ddf b/src/GxInterface_PCC_3GPP_TS29212_aa0.ddf
index ca60fe00663e587ec4cf38208d659bc1f6c135cd..0864f80d91b939f987e72cbd9fedfd380ecb3e4e 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/GxInterface_PCC_3GPP_TS29212_c52.ddf b/src/GxInterface_PCC_3GPP_TS29212_c52.ddf
index ddd76625189511e2d1ddf4e7bba0c3f24385c577..51d431c98a15c54da06d23f71bd6082d12b59cb3 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/GxInterface_PCC_3GPP_TS29212_d70.ddf b/src/GxInterface_PCC_3GPP_TS29212_d70.ddf
new file mode 100644
index 0000000000000000000000000000000000000000..3a8cd54699d55bf17ecf2c10b1120602184bd878
--- /dev/null
+++ b/src/GxInterface_PCC_3GPP_TS29212_d70.ddf
@@ -0,0 +1,1099 @@
+/******************************************************************************
+* 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
+*   Kalman Mikecz
+*   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
+*   Akos Makovics
+******************************************************************************/
+//
+//  File:               GxInterface_PCC_3GPP_TS29212_d70.ddf
+//  Description:        DDF for Gx according to 3GPP TS 29.212 V13.7.0
+//  Rev:                R55A
+//  Prodnr:             CNL 113 462
+///////////////////////////////////////////////
+
+
+// APPLICATION-NAME: PCC
+// APPLICATION-REVISION: VC_5_2
+
+// AVP implementations according to:
+// 3GPP TS 29.212 V13.7.0 - Policy and Charging Control over Gx interface
+//
+//
+// Dependant applications
+// IETF RFC 3588   - Diameter Base Protocol
+// IETF RFC 4005   - Diameter Network Address Server
+// IETF RFC 4006   - Diameter Credit Control Application
+// 3GPP TS 29.061  - Interworking between the Public Land Mobile Network (PLMN) supporting packet based services and Packet Data Networks (PDN)
+// 3GPP TS 29.214  - Policy and Charging Control over Rx reference points
+// 3GPP TS 29.229  - Cx and Dx interfaces based on the Diameter protocol
+// 3GPP TS 29.272  - EPS; MME and SGSN related interfaces based on Diameter protocol
+// 3GPP2 X.S0057-O - (3GPP2-BSID AVP reused for Gx and Gxx interface)
+// 3GPP TS 32.299  - Telecommunication manegement; Charging management; Diameter charging applications
+//
+// Notes:
+// Present application is based on 3GPP TS 29.210 V6.7.0 but has its own vendor
+// specific Diameter application with application id: 16777238
+//
+
+// 3GPP TS 29.212 V13.7.0 5.6
+type enumerated Command_Code {
+  Credit_Control (272),
+  Re_Auth        (258)
+}
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Bearer-Usage (1000) 3GPP (10415)
+// 5.3.1
+type enumerated Bearer_Usage
+{
+  GENERAL        (0),
+  IMS_SIGNALLING (1)
+}
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Charging-Rule-Install (1001) 3GPP (10415)
+// 5.3.2
+type AVP_Grouped Charging_Rule_Install;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Charging-Rule-Remove (1002) 3GPP (10415)
+// 5.3.3
+type AVP_Grouped Charging_Rule_Remove;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Charging-Rule-Definition (1003) 3GPP (10415)
+// 5.3.4
+type AVP_Grouped Charging_Rule_Definition;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Charging-Rule-Base-Name (1004) 3GPP (10415)
+// 5.3.5
+type AVP_UTF8String Charging_Rule_Base_Name;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Charging-Rule-Name (1005) 3GPP (10415)
+// 5.3.6
+type AVP_OctetString Charging_Rule_Name;
+
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Event-Trigger (1006) 3GPP (10415)
+// 5.3.7
+type enumerated Event_Trigger
+{
+  SGSN_CHANGE                         (0),
+  QOS_CHANGE                          (1),
+  RAT_CHANGE                          (2),
+  TFT_CHANGE                          (3),
+  PLMN_CHANGE                         (4),
+  LOSS_OF_BEARER                      (5),
+  RECOVERY_OF_BEARER                  (6),
+  IP_CAN_CHANGE                       (7),
+  QOS_CHANGE_EXCEEDING_AUTHORIZATION (11),
+  RAI_CHANGE                         (12),
+  USER_LOCATION_CHANGE               (13),
+  NO_EVENT_TRIGGERS                  (14),
+  OUT_OF_CREDIT                      (15),
+  REALLOCATION_OF_CREDIT             (16),
+  REVALIDATION_TIMEOUT               (17),
+  UE_IP_ADDRESS_ALLOCATE             (18),
+  UE_IP_ADDRESS_RELEASE              (19),
+  DEFAULT_EPS_BEARER_QOS_CHANGE      (20),
+  AN_GW_CHANGE                       (21),
+  SUCCESSFUL_RESOURCE_ALLOCATION     (22),
+  RESOURCE_MODIFICATION_REQUEST      (23),
+  PGW_TRACE_CONTROL                  (24),
+  UE_TIME_ZONE_CHANGE                (25),
+  TAI_CHANGE                         (26),
+  ECGI_CHANGE                        (27),
+  CHARGING_CORRELATION_EXCHANGE      (28),
+  APN_AMBR_MODIFICATION_FAILURE      (29),
+  USER_CSG_INFORMATION_CHANGE        (30),
+  USAGE_REPORT                       (33),
+  DEFAULT_EPS_BEARER_QOS_MODIFICATION_FAILURE (34),
+  USER_CSG_HYBRID_SUBSCRIBED_INFORMATION_CHANGE (35),
+  USER_CSG_HYBRID_UNSUBSCRIBED_INFORMATION_CHANGE (36),
+  ROUTING_RULE_CHANGE                (37),
+  APPLICATION_START                  (39),
+  APPLICATION_STOP                   (40),
+  CS_TO_PS_HANDOVER                  (42),
+  UE_LOCAL_IP_ADDRESS_CHANGE         (43),
+  HENB_LOCAL_IP_ADDRESS_CHANGE       (44),
+  ACCESS_NETWORK_INFO_REPORT         (45),
+  CREDIT_MANAGEMENT_SESSION_FAILURE  (46),
+  DEFAULT_QOS_CHANGE                 (47),
+  CHANGE_OF_UE_PRESENCE_IN_PRESENCE_REPORTING_AREA_REPORT (48),
+  ADDITION_OF_ACCESS (49),
+  REMOVAL_OF_ACCESS (50),
+  UNAVAILABLITY_OF_ACCESS (51),
+  AVAILABLITY_OF_ACCESS (52),
+  RESOURCE_RELEASE (53)
+}
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Metering-Method (1007) 3GPP (10415)
+// 5.3.8
+type enumerated Metering_Method
+{
+  DURATION            (0),
+  VOLUME              (1),
+  DURATION_VOLUME     (2),
+  EVENT               (3)
+}
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Offline (1008) 3GPP (10415)
+// 5.3.9
+type enumerated Offline
+{
+  DISABLE_OFFLINE     (0),
+  ENABLE_OFFLINE      (1)
+}
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Online (1009) 3GPP (10415)
+// 5.3.10
+type enumerated Online
+{
+  DISABLE_ONLINE      (0),
+  ENABLE_ONLINE       (1)
+}
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Precedence (1010) 3GPP (10415)
+// 5.3.11
+type AVP_Unsigned32 Precedence;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Reporting-Level (1011) 3GPP (10415)
+// 5.3.12
+type enumerated Reporting_Level
+{
+  SERVICE_IDENTIFIER_LEVEL (0),
+  RATING_GROUP_LEVEL       (1),
+  SPONSORED_CONNECTIVITY_LEVEL (2)
+}
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: TFT-Filter (1012) 3GPP (10415)
+// 5.3.13
+type AVP_IPFilterRule TFT_Filter;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: TFT-Packet-Filter-Information (1013) 3GPP (10415)
+// 5.3.14
+type AVP_Grouped TFT_Packet_Filter_Information;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: ToS-Traffic-Class (1014) 3GPP (10415)
+// 5.3.15
+type AVP_OctetString ToS_Traffic_Class;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: QoS-Information (1016) 3GPP (10415)
+// 5.3.16
+type AVP_Grouped QoS_Information;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: QoS-Class-Identifier (1028) 3GPP (10415)
+// 5.3.17
+type AVP_Unsigned32 QoS_Class_Identifier;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Charging-Rule-Report (1018) 3GPP (10415)
+// 5.3.18
+type AVP_Grouped Charging_Rule_Report;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: PCC-Rule-Status (1019) 3GPP (10415)
+// 5.3.19
+type enumerated PCC_Rule_Status
+{
+  ACTIVE               (0),
+  INACTIVE             (1),
+  TEMPORARILY_INACTIVE (2)
+}
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Bearer-Identifier (1020) 3GPP (10415)
+// 5.3.20
+type AVP_OctetString Bearer_Identifier;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Bearer-Operation (1021) 3GPP (10415)
+// 5.3.21
+type enumerated Bearer_Operation
+{
+  TERMINATION   (0),
+  ESTABLISHMENT (1),
+  MODIFICATION  (2)
+}
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Access-Network-Charging-Identifier-Gx (1022) 3GPP (10415)
+// 5.3.22
+type AVP_Grouped Access_Network_Charging_Identifier_Gx;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Bearer-Control-Mode (1023) 3GPP (10415)
+// 5.3.23
+type enumerated Bearer_Control_Mode
+{
+  UE_ONLY  (0),
+  RESERVED (1),
+  UE_NW    (2),
+  SX_GX    (3),
+  SX_ONLY  (4)
+}
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Network-Request-Support (1024) 3GPP (10415)
+// 5.3.24
+type enumerated Network_Request_Support
+{
+  NETWORK_REQUEST_NOT_SUPPORTED (0),
+  NETWORK_REQUEST_SUPPORTED (1)
+}
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Guaranteed-Bitrate-DL (1025) 3GPP (10415)
+// 5.3.25
+type AVP_Unsigned32 Guaranteed_Bitrate_DL;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Guaranteed-Bitrate-UL (1026) 3GPP (10415)
+// 5.3.26
+type AVP_Unsigned32 Guaranteed_Bitrate_UL;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: IP-CAN-Type (1027) 3GPP (10415)
+// 5.3.27
+type enumerated IP_CAN_Type
+{
+  threeGPP_GPRS (0),
+  DOCSIS        (1),
+  xDSL          (2),
+  WiMAX         (3),
+  threeGPP2     (4),
+  threeGPP_EPS  (5),
+  Non_threeGPP_EPS  (6),
+  FBA           (7)
+}
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: QoS-Negotiation (1029) 3GPP (10415)
+// 5.3.28
+type enumerated QoS_Negotiation
+{
+  NO_QoS_NEGOTIATION        (0),
+  QoS_NEGOTIATION_SUPPORTED (1)
+}
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: QoS-Upgrade (1030) 3GPP (10415)
+// 5.3.29
+type enumerated QoS_Upgrade
+{
+  QoS_UPGRADE_NOT_SUPPORTED (0),
+  QoS_UPGRADE_SUPPORTED     (1)
+}
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Event-Report-Indication (1033) 3GPP (10415)
+// 5.3.30
+type AVP_Grouped Event_Report_Indication;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: RAT-Type (1032) 3GPP (10415)
+// 5.3.31
+type enumerated RAT_Type
+{
+  WLAN              (0),
+  VIRTUAL           (1),
+  UTRAN          (1000),
+  GERAN          (1001),
+  GAN            (1002),
+  HSPA_EVOLUTION (1003),
+  EUTRAN         (1004),
+  EUTRAN_NB_IoT  (1005),
+  CDMA2000_1X    (2000),
+  HRPD           (2001),
+  UMB            (2002),
+  EHRPD          (2003)
+}
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Allocation-Retention-Priority (1034) 3GPP (10415)
+// 5.3.32
+type AVP_Grouped Allocation_Retention_Priority;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: CoA-IP-Address (1035) 3GPP (10415)
+// 5.3.33
+type AVP_Address CoA_IP_Address;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Tunnel-Header-Filter (1036) 3GPP (10415)
+// 5.3.34
+type AVP_IPFilterRule Tunnel_Header_Filter;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Tunnel-Header-Length (1037) 3GPP (10415)
+// 5.3.35
+type AVP_Unsigned32 Tunnel_Header_Length;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Tunnel-Information (1038) 3GPP (10415)
+// 5.3.36
+type AVP_Grouped Tunnel_Information;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: CoA-Information (1039) 3GPP (10415)
+// 5.3.37
+type AVP_Grouped CoA_Information;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Rule-Failure-Code (1031) 3GPP (10415)
+// 5.3.38
+type enumerated Rule_Failure_Code
+{
+  UNKNOWN_RULE_NAME                     (1),
+  RATING_GROUP_ERROR                    (2),
+  SERVICE_IDENTIFIER_ERROR              (3),
+  GW_PCEF_MALFUNCTION                   (4),
+  RESOURCES_LIMITATION                  (5),
+  MAX_NR_BEARERS_REACHED                (6),
+  UNKNOWN_BEARER_ID                     (7),
+  MISSING_BEARER_ID                     (8),
+  MISSING_FLOW_DESCRIPTION              (9),
+  RESOURCE_ALLOCATION_FAILURE           (10),
+  UNSUCCESSFUL_QOS_VALIDATION           (11),
+  INCORRECT_FLOW_INFORMATION            (12),
+  PS_TO_CS_HANDOVER                     (13),
+  TDF_APPLICATION_IDENTIFIER_ERROR      (14),
+  NO_BEARER_BOUND                       (15),
+  FILTER_RESTRICTIONS                   (16),
+  AN_GW_FAILED                          (17),
+  MISSING_REDIRECT_SERVER_ADDRESS       (18),
+  CM_END_USER_SERVICE_DENIED            (19),
+  CM_CREDIT_CONTROL_NOT_APPLICABLE      (20),
+  CM_AUTHORIZATION_REJECTED             (21),
+  CM_USER_UNKNOWN                       (22),
+  CM_RATING_FAILED                      (23),
+  ROUTING_RULE_REJECTION                (24),
+  UNKNOWN_ROUTING_ACCESS_INFORMATION    (25),
+  UNKNOWN                               (99)
+}
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: APN-Aggregate-Max-Bitrate-DL (1040) 3GPP (10415)
+// 5.3.39
+type AVP_Unsigned32 APN_Aggregate_Max_Bitrate_DL;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: APN-Aggregate-Max-Bitrate-UL (1041) 3GPP (10415)
+// 5.3.40
+type AVP_Unsigned32 APN_Aggregate_Max_Bitrate_UL;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Revalidation-Time (1042) 3GPP (10415)
+// 5.3.41
+type AVP_Time Revalidation_Time;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Rule-Activation-Time (1043) 3GPP (10415)
+// 5.3.42
+type AVP_Time Rule_Activation_Time;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Rule-DeActivation-Time (1044) 3GPP (10415)
+// 5.3.43
+type AVP_Time Rule_DeActivation_Time;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Session-Release-Cause (1045) 3GPP (10415)
+// 5.3.44
+type enumerated Session_Release_Cause
+{
+  UNSPECIFIED_REASON            (0),
+  UE_SUBSCRIPTION_REASON        (1),
+  INSUFFICIENT_SERVER_RESOURCES (2),
+  IP_CAN_SESSION_TERMINATION    (3),
+  UE_IP_ADDRESS_RELEASE         (4)
+}
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Priority-Level (1046) 3GPP (10415)
+// 5.3.45
+type AVP_Unsigned32 Priority_Level;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Pre-emption-Capability (1047) 3GPP (10415)
+// 5.3.46
+type enumerated Pre_emption_Capability
+{
+  PRE_EMPTION_CAPABILITY_ENABLED  (0),
+  PRE_EMPTION_CAPABILITY_DISABLED (1)
+}
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Pre-emption-Vulnerability (1048) 3GPP (10415)
+// 5.3.47
+type enumerated Pre_emption_Vulnerability
+{
+  PRE_EMPTION_VULNERABILITY_ENABLED  (0),
+  PRE_EMPTION_VULNERABILITY_DISABLED (1)
+}
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Default-EPS-Bearer-QoS (1049) 3GPP (10415)
+// 5.3.48
+type AVP_Grouped Default_EPS_Bearer_QoS;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: AN-GW-Address (1050) 3GPP (10415)
+// 5.3.49
+type AVP_Address AN_GW_Address;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Resource-Allocation-Notification (1063) 3GPP (10415)
+// 5.3.50
+type enumerated Resource_Allocation_Notification
+{
+  ENABLE_NOTIFICATION (0)
+}
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Security-Parameter-Index (1056) 3GPP (10415)
+// 5.3.51
+type AVP_OctetString Security_Parameter_Index;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Flow-Label (1057) 3GPP (10415)
+// 5.3.52
+type AVP_OctetString Flow_Label;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Flow-Information (1058) 3GPP (10415)
+// 5.3.53
+type AVP_Grouped Flow_Information;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Packet-Filter-Content (1059) 3GPP (10415)
+// 5.3.54
+type AVP_IPFilterRule Packet_Filter_Content;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Packet-Filter-Identifier (1060) 3GPP (10415)
+// 5.3.55
+type AVP_OctetString Packet_Filter_Identifier;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Packet-Filter-Information (1061) 3GPP (10415)
+// 5.3.56
+type AVP_Grouped Packet_Filter_Information;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Packet-Filter-Operation (1062) 3GPP (10415)
+// 5.3.57
+type enumerated Packet_Filter_Operation
+{
+  DELETION  (0),
+  ADDITION  (1),
+  MODIFICATION (2)
+}
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: PDN-Connection-ID (1065) 3GPP (10415)
+// 5.3.58
+type AVP_OctetString PDN_Connection_ID;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Monitoring-Key (1066) 3GPP (10415)
+// 5.3.59
+type AVP_OctetString Monitoring_Key;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Usage-Monitoring-Information (1067) 3GPP (10415)
+// 5.3.60
+type AVP_Grouped Usage_Monitoring_Information;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Usage-Monitoring-Level (1068) 3GPP (10415)
+// 5.3.61
+type enumerated Usage_Monitoring_Level
+{
+  SESSION_LEVEL   (0),
+  PCC_RULE_LEVEL  (1),
+  ADC_RULE_LEVEL  (2)
+}
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Usage-Monitoring-Report (1069) 3GPP (10415)
+// 5.3.62
+type enumerated Usage_Monitoring_Report
+{
+  USAGE_MONITORING_REPORT_REQUIRED  (0)
+}
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Usage-Monitoring-Support (1070) 3GPP (10415)
+// 5.3.63
+type enumerated Usage_Monitoring_Support
+{
+  USAGE_MONITORING_DISABLED (0)
+}
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: CSG-Information-Reporting (1071) 3GPP (10415)
+// 5.3.64
+type enumerated CSG_Information_Reporting
+{
+  CHANGE_CSG_CELL                     (0),
+  CHANGE_CSG_SUBSCRIBED_HYBRID_CELL   (1),
+  CHANGE_CSG_UNSUBSCRIBED_HYBRID_CELL (2)
+}
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Flow-Direction (1080) 3GPP (10415)
+// 5.3.65
+type enumerated Flow_Direction
+{
+  UNSPECIFIED                         (0),
+  DOWNLINK                            (1),
+  UPLINK                              (2),
+  BIDIRECTIONAL                       (3)
+}
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Packet-Filter-Usage (1072) 3GPP (10415)
+// 5.3.66
+type enumerated Packet_Filter_Usage
+{
+  SEND_TO_UE (1)
+}
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Charging-Correlation-Indicator (1073) 3GPP (10415)
+// 5.3.67
+type enumerated Charging_Correlation_Indicator
+{
+  CHARGING_IDENTIFIER_REQUIRED   (0)
+}
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Routing-Rule-Install (1081) 3GPP (10415)
+// 5.3.68
+type AVP_Grouped Routing_Rule_Install;
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Routing-Rule-Remove (1075) 3GPP (10415)
+// 5.3.69
+type AVP_Grouped Routing_Rule_Remove;
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Routing-Rule-Definition (1076) 3GPP (10415)
+// 5.3.70
+type AVP_Grouped Routing_Rule_Definition;
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Routing-Rule-Identifier (1077) 3GPP (10415)
+// 5.3.71
+type AVP_OctetString Routing_Rule_Identifier;
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Routing-Filter (1078) 3GPP (10415)
+// 5.3.72
+type AVP_Grouped Routing_Filter;
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Routing-IP-Address (1079) 3GPP (10415)
+// 5.3.72
+type AVP_Address Routing_IP_Address;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: TDF-Application-Identifier (1088) 3GPP (10415)
+// 5.3.77
+type AVP_OctetString TDF_Application_Identifier;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: TDF-Information (1087) 3GPP (10415)
+// 5.3.78
+type AVP_Grouped TDF_Information;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: TDF-Destination-Realm (1090) 3GPP (10415)
+// 5.3.79
+type AVP_DiameterIdentity TDF_Destination_Realm;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: TDF-Destination-Host (1089) 3GPP (10415)
+// 5.3.80
+type AVP_DiameterIdentity TDF_Destination_Host;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: TDF-IP-Address (1091) 3GPP (10415)
+// 5.3.81
+type AVP_Address TDF_IP_Address;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Redirect-Information (1085) 3GPP (10415)
+// 5.3.82
+type AVP_Grouped Redirect_Information;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Redirect-Support (1086) 3GPP (10415)
+// 5.3.83
+type enumerated Redirect_Support
+{
+  REDIRECTION_DISABLED (0),
+  REDIRECTION_ENABLED (1)
+}
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: PS-to-CS-Session-Continuity (1099) 3GPP (10415)
+// 5.3.84
+type enumerated PS_to_CS_Session_Continuity
+{
+  VIDEO_PS2CS_CONT_CANDIDATE (0)
+}
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Application-Detection-Information (1098) 3GPP (10415)
+// 5.3.91
+type AVP_Grouped Application_Detection_Information;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: TDF-Application-Instance-Identifier (2802) 3GPP (10415)
+// 5.3.92
+type AVP_OctetString TDF_Application_Instance_Identifier;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: HeNB-Local-IP-Address (2804) 3GPP (10415)
+// 5.3.95
+type AVP_Address HeNB_Local_IP_Address;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: UE-Local-IP-Address (2805) 3GPP (10415)
+// 5.3.96
+type AVP_Address UE_Local_IP_Address;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: UDP-Source-Port (2806) 3GPP (10415)
+// 5.3.97
+type AVP_Unsigned32 UDP_Source_Port;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Mute-Notification (2809) 3GPP (10415)
+// 5.3.98
+type enumerated Mute_Notification
+{
+  MUTE_REQUIRED (0)
+}
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Monitoring-Time (2810) 3GPP (10415)
+// 5.3.99
+type AVP_Time Monitoring_Time;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: AN-GW-Status (2811) 3GPP (10415)
+// 5.3.100
+type enumerated AN_GW_Status
+{
+  AN_GW_FAILED (0)
+}
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: User-Location-Info-Time (2812) 3GPP (10415)
+// 5.3.101
+type AVP_Time User_Location_Info_Time;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Credit-Management-Status (1082) 3GPP (10415)
+// 5.3.102
+type AVP_Unsigned32 Credit_Management_Status;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Default-QoS-Information (2816) 3GPP (10415)
+// 5.3.103
+type AVP_Grouped Default_QoS_Information;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Default-QoS-Name (2817) 3GPP (10415)
+// 5.3.104
+type AVP_UTF8String Default_QoS_Name;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Conditional-APN-Aggregate-Max-Bitrate (2818) 3GPP (10415)
+// 5.3.105
+type AVP_Grouped Conditional_APN_Aggregate_Max_Bitrate;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: RAN-NAS-Release-Cause (2819) 3GPP (10415)
+// 5.3.106
+type AVP_OctetString RAN_NAS_Release_Cause;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Presence-Reporting-Area-Elements-List (2820) 3GPP (10415)
+// 5.3.107
+type AVP_OctetString Presence_Reporting_Area_Elements_List;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Presence-Reporting-Area-Identifier (2821) 3GPP (10415)
+// 5.3.108
+type AVP_OctetString Presence_Reporting_Area_Identifier;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Presence-Reporting-Area-Information (2822) 3GPP (10415)
+// 5.3.109
+type AVP_Grouped Presence_Reporting_Area_Information;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Presence-Reporting-Area-Status (2823) 3GPP (10415)
+// 5.3.110
+type AVP_Unsigned32 Presence_Reporting_Area_Status;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: NetLoc-Access-Support (2824) 3GPP (10415)
+// 5.3.111
+type AVP_Unsigned32 NetLoc_Access_Support;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Fixed-User-Location-Info (2825) 3GPP (10415)
+// 5.3.112
+type AVP_Grouped Fixed_User_Location_Info;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: PCSCF-Restoration-Indication (2826) 3GPP (10415)
+// 5.3.113
+type AVP_Unsigned32 PCSCF_Restoration_Indication;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: IP-CAN-Session-Charging-Scope (2827) 3GPP (10415)
+// 5.3.114
+type enumerated IP_CAN_Session_Charging_Scope
+{
+  IP_CAN_SESSION_SCOPE (0)
+}
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Monitoring-Flags (2828) 3GPP (10415)
+// 5.3.115
+type AVP_Unsigned32 Monitoring_Flags;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: NBIFOM-Support (2831) 3GPP (10415)
+// 5.3.116
+type enumerated NBIFOM_Support
+{
+  NBIFOM_NOT_SUPPORTED (0),
+  NBIFOM_SUPPORTED (1)
+}
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: NBIFOM-Mode (2830) 3GPP (10415)
+// 5.3.117
+type enumerated NBIFOM_Mode
+{
+  UE_INITIATED (0),
+  NETWORK_INITIATED (1)
+}
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Routing-Rule-Report (2835) 3GPP (10415)
+// 5.3.118
+type AVP_Grouped Routing_Rule_Report;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Routing-Rule-Failure-Code (2834) 3GPP (10415)
+// 5.3.119
+type AVP_Unsigned32 Routing_Rule_Failure_Code;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Default-Access (2829) 3GPP (10415)
+// 5.3.120
+type enumerated Default_Access
+{
+  threeGPP_GPRS (0),
+  DOCSIS        (1),
+  xDSL          (2),
+  WiMAX         (3),
+  threeGPP2     (4),
+  threeGPP_EPS  (5),
+  Non_threeGPP_EPS  (6),
+  FBA           (7)
+}
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Access-Availability-Change-Reason (2833) 3GPP (10415)
+// 5.3.121
+type AVP_Unsigned32 Access_Availability_Change_Reason;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: RAN-Rule-Support (2832) 3GPP (10415)
+// 5.3.122
+type AVP_Unsigned32 RAN_Rule_Support;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Traffic-Steering-Policy-Identifier-DL (2836) 3GPP (10415)
+// 5.3.123
+type AVP_OctetString Traffic_Steering_Policy_Identifier_DL;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Traffic-Steering-Policy-Identifier-UL (2837) 3GPP (10415)
+// 5.3.124
+type AVP_OctetString Traffic_Steering_Policy_Identifier_UL;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Resource-Release-Notification (2841) 3GPP (10415)
+// 5.3.125
+type enumerated Resource_Release_Notification
+{
+  ENABLE_NOTIFICATION (0)
+}
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Removal-Of-Access (2842) 3GPP (10415)
+// 5.3.126
+type enumerated Removal_Of_Access
+{
+  REMOVAL_OF_ACCESS (0)
+}
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Execution-Time (2839) 3GPP (10415)
+// 5.3.127
+type AVP_Time Execution_Time;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Conditional-Policy-Information (2840) 3GPP (10415)
+// 5.3.128
+type AVP_Grouped Conditional_Policy_Information;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: TCP-Source-Port (2843) 3GPP (10415)
+// 5.3.129
+type AVP_Unsigned32 TCP_Source_Port;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: QoS-Rule-Install (1051) 3GPP (10415)
+// 5a.3.1
+type AVP_Grouped QoS_Rule_Install;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: QoS-Rule-Remove (1052) 3GPP (10415)
+// 5a.3.2
+type AVP_Grouped QoS_Rule_Remove;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: QoS-Rule-Definition (1053) 3GPP (10415)
+// 5a.3.3
+type AVP_Grouped QoS_Rule_Definition;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: QoS-Rule-Name (1054) 3GPP (10415)
+// 5a.3.4
+type AVP_OctetString QoS_Rule_Name;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: QoS-Rule-Report (1055) 3GPP (10415)
+// 5a.3.5
+type AVP_Grouped QoS_Rule_Report;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: Session-Linking-Indicator (1064) 3GPP (10415)
+// 5a.3.6
+type enumerated Session_Linking_Indicator
+{
+  SESSION_LINKING_IMMEDIATE (0),
+  SESSION_LINKING_DEFERRED  (1),
+  SESSION_LINKING_INVALID   (100)  //Requested for negative testing in CR_TR00019832.
+}
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: QoS-Rule-Base-Name (1074) 3GPP (10415)
+// 5a.3.7
+type AVP_UTF8String QoS_Rule_Base_Name;
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: ADC-Rule-Install (1092) 3GPP (10415)
+// 5b.3.1
+type AVP_Grouped ADC_Rule_Install;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: ADC-Rule-Remove (1093) 3GPP (10415)
+// 5b.3.2
+type AVP_Grouped ADC_Rule_Remove;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: ADC-Rule-Definition (1094) 3GPP (10415)
+// 5b.3.3
+type AVP_Grouped ADC_Rule_Definition;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: ADC-Rule-Base-Name (1095) 3GPP (10415)
+// 5b.3.4
+type AVP_UTF8String ADC_Rule_Base_Name;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: ADC-Rule-Name (1096) 3GPP (10415)
+// 5b.3.5
+type AVP_OctetString ADC_Rule_Name;
+
+
+// 3GPP TS 29.212 V13.7.0
+// AVP: ADC-Rule-Report (1097) 3GPP (10415)
+// 5b.3.6
+type AVP_Grouped ADC_Rule_Report;
+
diff --git a/src/GxInterface_PCC_3GPP_TS29212_e00.ddf b/src/GxInterface_PCC_3GPP_TS29212_e00.ddf
new file mode 100644
index 0000000000000000000000000000000000000000..b3def9d277e1ee5a47959dd51ab6b196b2fc5dca
--- /dev/null
+++ b/src/GxInterface_PCC_3GPP_TS29212_e00.ddf
@@ -0,0 +1,1073 @@
+/******************************************************************************
+* Copyright (c) 2004, 2017  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:               GxInterface_PCC_3GPP_TS29212_e00.ddf
+//  Description:        DDF for Gx Gxx and Sd according to 3GPP TS 29.212 V14.0.0
+//  Rev:                R55A
+//  Prodnr:             CNL 113 462
+///////////////////////////////////////////////
+
+
+// APPLICATION-NAME: PCC
+// APPLICATION-REVISION: Ve_0_0
+
+// AVP implementations according to: 
+// 3GPP TS 29.212 V14.0.0 - Policy and Charging Control over Gx interface
+//
+//
+// Dependant applications 
+// IETF RFC 3588   - Diameter Base Protocol
+// IETF RFC 4005   - Diameter Network Address Server
+// IETF RFC 4006   - Diameter Credit Control Application
+// 3GPP TS 29.061  - Interworking between the Public Land Mobile Network (PLMN) supporting packet based services and Packet Data Networks (PDN)
+// 3GPP TS 29.214  - Policy and Charging Control over Rx reference points
+// 3GPP TS 29.229  - Cx and Dx interfaces based on the Diameter protocol
+// 3GPP TS 29.272  - EPS; MME and SGSN related interfaces based on Diameter protocol
+// 3GPP2 X.S0057-O - (3GPP2-BSID AVP reused for Gx and Gxx interface)
+// 3GPP TS 32.299  - Telecommunication manegement; Charging management; Diameter charging applications
+//
+// Notes: 
+// Present application is based on 3GPP TS 29.210 V6.7.0 but has its own vendor 
+// specific Diameter application with application id for the Gx Application : 16777238
+// Application-ID for the Gxx Application is 16777266
+// Application-ID for the Sd Application is 16777303
+
+// 3GPP TS 29.212 V14.0.0
+// 5.6, 5b.6, 5c.6 
+type enumerated Command_Code {
+  Credit_Control (272),
+  Re_Auth        (258),
+  TDF_Session    (8388637)
+}
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Bearer-Usage (1000) 3GPP (10415)
+// 5.3.1
+type enumerated Bearer_Usage
+{
+  GENERAL        (0),
+  IMS_SIGNALLING (1)
+}
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Charging-Rule-Install (1001) 3GPP (10415)
+// 5.3.2
+type AVP_Grouped Charging_Rule_Install;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Charging-Rule-Remove (1002) 3GPP (10415)
+// 5.3.3
+type AVP_Grouped Charging_Rule_Remove;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Charging-Rule-Definition (1003) 3GPP (10415)
+// 5.3.4
+type AVP_Grouped Charging_Rule_Definition;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Charging-Rule-Base-Name (1004) 3GPP (10415)
+// 5.3.5
+type AVP_UTF8String Charging_Rule_Base_Name;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Charging-Rule-Name (1005) 3GPP (10415)
+// 5.3.6
+type AVP_OctetString Charging_Rule_Name;
+
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Event-Trigger (1006) 3GPP (10415)
+// 5.3.7
+type enumerated Event_Trigger
+{
+  SGSN_CHANGE                         (0),
+  QOS_CHANGE                          (1),
+  RAT_CHANGE                          (2),
+  TFT_CHANGE                          (3),
+  PLMN_CHANGE                         (4),
+  LOSS_OF_BEARER                      (5),
+  RECOVERY_OF_BEARER                  (6),
+  IP_CAN_CHANGE                       (7),
+  QOS_CHANGE_EXCEEDING_AUTHORIZATION (11),
+  RAI_CHANGE                         (12),
+  USER_LOCATION_CHANGE               (13),
+  NO_EVENT_TRIGGERS                  (14),
+  OUT_OF_CREDIT                      (15),
+  REALLOCATION_OF_CREDIT             (16),
+  REVALIDATION_TIMEOUT               (17),
+  UE_IP_ADDRESS_ALLOCATE             (18),
+  UE_IP_ADDRESS_RELEASE              (19),
+  DEFAULT_EPS_BEARER_QOS_CHANGE      (20),
+  AN_GW_CHANGE                       (21),
+  SUCCESSFUL_RESOURCE_ALLOCATION     (22),
+  RESOURCE_MODIFICATION_REQUEST      (23),
+  PGW_TRACE_CONTROL                  (24),
+  UE_TIME_ZONE_CHANGE                (25),
+  TAI_CHANGE                         (26),
+  ECGI_CHANGE                        (27),
+  CHARGING_CORRELATION_EXCHANGE      (28),
+  APN_AMBR_MODIFICATION_FAILURE      (29),  
+  USER_CSG_INFORMATION_CHANGE        (30),
+  USAGE_REPORT                       (33),
+  DEFAULT_EPS_BEARER_QOS_MODIFICATION_FAILURE (34),
+  USER_CSG_HYBRID_SUBSCRIBED_INFORMATION_CHANGE (35),
+  USER_CSG_HYBRID_UNSUBSCRIBED_INFORMATION_CHANGE (36),
+  ROUTING_RULE_CHANGE                (37),
+  APPLICATION_START                  (39),
+  APPLICATION_STOP                   (40),
+  CS_TO_PS_HANDOVER                  (42),
+  UE_LOCAL_IP_ADDRESS_CHANGE         (43),
+  HENB_LOCAL_IP_ADDRESS_CHANGE       (44),
+  ACCESS_NETWORK_INFO_REPORT         (45),
+  CREDIT_MANAGEMENT_SESSION_FAILURE  (46),
+  DEFAULT_QOS_CHANGE                 (47),
+  CHANGE_OF_UE_PRESENCE_IN_PRESENCE_REPORTING_AREA_REPORT (48),
+  ADDITION_OF_ACCESS (49),
+  REMOVAL_OF_ACCESS (50),
+  UNAVAILABLITY_OF_ACCESS (51),
+  AVAILABLITY_OF_ACCESS (52),
+  RESOURCE_RELEASE (53),
+  ENODEB_CHANGE (54)
+}
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Metering-Method (1007) 3GPP (10415)
+// 5.3.8
+type enumerated Metering_Method
+{
+  DURATION            (0),
+  VOLUME              (1),
+  DURATION_VOLUME     (2),
+  EVENT               (3)
+}
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Offline (1008) 3GPP (10415)
+// 5.3.9
+type enumerated Offline
+{
+  DISABLE_OFFLINE     (0),
+  ENABLE_OFFLINE      (1)
+}
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Online (1009) 3GPP (10415)
+// 5.3.10
+type enumerated Online
+{
+  DISABLE_ONLINE      (0),
+  ENABLE_ONLINE       (1)
+}
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Precedence (1010) 3GPP (10415)
+// 5.3.11
+type AVP_Unsigned32 Precedence;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Reporting-Level (1011) 3GPP (10415)
+// 5.3.12
+type enumerated Reporting_Level
+{
+  SERVICE_IDENTIFIER_LEVEL (0),
+  RATING_GROUP_LEVEL       (1),
+  SPONSORED_CONNECTIVITY_LEVEL (2)
+}
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: TFT-Filter (1012) 3GPP (10415)
+// 5.3.13
+type AVP_IPFilterRule TFT_Filter;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: TFT-Packet-Filter-Information (1013) 3GPP (10415)
+// 5.3.14
+type AVP_Grouped TFT_Packet_Filter_Information;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: ToS-Traffic-Class (1014) 3GPP (10415)
+// 5.3.15
+type AVP_OctetString ToS_Traffic_Class;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: QoS-Information (1016) 3GPP (10415)
+// 5.3.16
+type AVP_Grouped QoS_Information;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: QoS-Class-Identifier (1028) 3GPP (10415)
+// 5.3.17
+type AVP_Unsigned32 QoS_Class_Identifier;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Charging-Rule-Report (1018) 3GPP (10415)
+// 5.3.18
+type AVP_Grouped Charging_Rule_Report;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: PCC-Rule-Status (1019) 3GPP (10415)
+// 5.3.19
+type enumerated PCC_Rule_Status
+{
+  ACTIVE               (0),
+  INACTIVE             (1),
+  TEMPORARILY_INACTIVE (2)  
+}
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Bearer-Identifier (1020) 3GPP (10415)
+// 5.3.20
+type AVP_OctetString Bearer_Identifier;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Bearer-Operation (1021) 3GPP (10415)
+// 5.3.21
+type enumerated Bearer_Operation
+{
+  TERMINATION   (0),
+  ESTABLISHMENT (1),
+  MODIFICATION  (2)
+}
+
+
+// 3GPP TS 29.212 V14.0.0 
+// AVP: Access-Network-Charging-Identifier-Gx (1022) 3GPP (10415)
+// 5.3.22
+type AVP_Grouped Access_Network_Charging_Identifier_Gx;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Bearer-Control-Mode (1023) 3GPP (10415)
+// 5.3.23
+type enumerated Bearer_Control_Mode
+{
+  UE_ONLY  (0),
+  RESERVED (1),
+  UE_NW    (2),
+  SX_GX    (3),
+  SX_ONLY  (4)
+}
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Network-Request-Support (1024) 3GPP (10415)
+// 5.3.24
+type enumerated Network_Request_Support
+{
+  NETWORK_REQUEST_NOT_SUPPORTED (0),
+  NETWORK_REQUEST_SUPPORTED (1) 
+}
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Guaranteed-Bitrate-DL (1025) 3GPP (10415)
+// 5.3.25
+type AVP_Unsigned32 Guaranteed_Bitrate_DL;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Guaranteed-Bitrate-UL (1026) 3GPP (10415)
+// 5.3.26
+type AVP_Unsigned32 Guaranteed_Bitrate_UL;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: IP-CAN-Type (1027) 3GPP (10415)
+// 5.3.27
+type enumerated IP_CAN_Type
+{
+  threeGPP_GPRS (0),
+  DOCSIS        (1),
+  xDSL          (2),
+  WiMAX         (3),
+  threeGPP2     (4),
+  threeGPP_EPS  (5),
+  Non_threeGPP_EPS  (6),
+  FBA           (7)
+}
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: QoS-Negotiation (1029) 3GPP (10415)
+// 5.3.28
+type enumerated QoS_Negotiation
+{
+  NO_QoS_NEGOTIATION        (0),
+  QoS_NEGOTIATION_SUPPORTED (1)
+}
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: QoS-Upgrade (1030) 3GPP (10415)
+// 5.3.29
+type enumerated QoS_Upgrade
+{
+  QoS_UPGRADE_NOT_SUPPORTED (0),
+  QoS_UPGRADE_SUPPORTED     (1)
+}
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Event-Report-Indication (1033) 3GPP (10415)
+// 5.3.30
+type AVP_Grouped Event_Report_Indication;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: RAT-Type (1032) 3GPP (10415)
+// 5.3.31
+type enumerated RAT_Type 
+{
+  WLAN              (0),
+  VIRTUAL           (1),
+  UTRAN          (1000),
+  GERAN          (1001),
+  GAN            (1002),
+  HSPA_EVOLUTION (1003),
+  EUTRAN         (1004),
+  EUTRAN_NB_IoT  (1005),
+  CDMA2000_1X    (2000),
+  HRPD           (2001),
+  UMB            (2002),
+  EHRPD          (2003)
+}
+
+
+// 3GPP TS 29.212 V14.0.0 
+// AVP: Allocation-Retention-Priority (1034) 3GPP (10415)
+// 5.3.32
+type AVP_Grouped Allocation_Retention_Priority;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: CoA-IP-Address (1035) 3GPP (10415)
+// 5.3.33
+type AVP_Address CoA_IP_Address;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Tunnel-Header-Filter (1036) 3GPP (10415)
+// 5.3.34
+type AVP_IPFilterRule Tunnel_Header_Filter;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Tunnel-Header-Length (1037) 3GPP (10415)
+// 5.3.35
+type AVP_Unsigned32 Tunnel_Header_Length;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Tunnel-Information (1038) 3GPP (10415)
+// 5.3.36
+type AVP_Grouped Tunnel_Information;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: CoA-Information (1039) 3GPP (10415)
+// 5.3.37
+type AVP_Grouped CoA_Information;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Rule-Failure-Code (1031) 3GPP (10415)
+// 5.3.38
+type enumerated Rule_Failure_Code
+{
+  UNKNOWN_RULE_NAME                     (1),
+  RATING_GROUP_ERROR                    (2),
+  SERVICE_IDENTIFIER_ERROR              (3),
+  GW_PCEF_MALFUNCTION                   (4),
+  RESOURCES_LIMITATION                  (5),
+  MAX_NR_BEARERS_REACHED                (6),
+  UNKNOWN_BEARER_ID                     (7),
+  MISSING_BEARER_ID                     (8),
+  MISSING_FLOW_DESCRIPTION              (9),
+  RESOURCE_ALLOCATION_FAILURE           (10),
+  UNSUCCESSFUL_QOS_VALIDATION           (11),
+  INCORRECT_FLOW_INFORMATION            (12),
+  PS_TO_CS_HANDOVER                     (13),
+  TDF_APPLICATION_IDENTIFIER_ERROR      (14),
+  NO_BEARER_BOUND                       (15),
+  FILTER_RESTRICTIONS                   (16),
+  AN_GW_FAILED                          (17),
+  MISSING_REDIRECT_SERVER_ADDRESS       (18),
+  CM_END_USER_SERVICE_DENIED            (19),
+  CM_CREDIT_CONTROL_NOT_APPLICABLE      (20),
+  CM_AUTHORIZATION_REJECTED             (21),
+  CM_USER_UNKNOWN                       (22),
+  CM_RATING_FAILED                      (23),
+  ROUTING_RULE_REJECTION                (24),
+  UNKNOWN_ROUTING_ACCESS_INFORMATION    (25)
+}
+
+
+// 3GPP TS 29.212 V14.0.0 
+// AVP: APN-Aggregate-Max-Bitrate-DL (1040) 3GPP (10415)
+// 5.3.39
+type AVP_Unsigned32 APN_Aggregate_Max_Bitrate_DL;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: APN-Aggregate-Max-Bitrate-UL (1041) 3GPP (10415)
+// 5.3.40
+type AVP_Unsigned32 APN_Aggregate_Max_Bitrate_UL;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Revalidation-Time (1042) 3GPP (10415)
+// 5.3.41
+type AVP_Time Revalidation_Time;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Rule-Activation-Time (1043) 3GPP (10415)
+// 5.3.42
+type AVP_Time Rule_Activation_Time;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Rule-DeActivation-Time (1044) 3GPP (10415)
+// 5.3.43
+type AVP_Time Rule_DeActivation_Time;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Session-Release-Cause (1045) 3GPP (10415)
+// 5.3.44
+type enumerated Session_Release_Cause
+{
+  UNSPECIFIED_REASON            (0),
+  UE_SUBSCRIPTION_REASON        (1),
+  INSUFFICIENT_SERVER_RESOURCES (2),
+  IP_CAN_SESSION_TERMINATION    (3),
+  UE_IP_ADDRESS_RELEASE         (4)
+}
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Priority-Level (1046) 3GPP (10415)
+// 5.3.45
+type AVP_Unsigned32 Priority_Level;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Pre-emption-Capability (1047) 3GPP (10415)
+// 5.3.46
+type enumerated Pre_emption_Capability
+{
+  PRE_EMPTION_CAPABILITY_ENABLED  (0),
+  PRE_EMPTION_CAPABILITY_DISABLED (1)
+}
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Pre-emption-Vulnerability (1048) 3GPP (10415)
+// 5.3.47
+type enumerated Pre_emption_Vulnerability
+{
+  PRE_EMPTION_VULNERABILITY_ENABLED  (0),
+  PRE_EMPTION_VULNERABILITY_DISABLED (1)
+}
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Default-EPS-Bearer-QoS (1049) 3GPP (10415)
+// 5.3.48
+type AVP_Grouped Default_EPS_Bearer_QoS;
+
+
+// 3GPP TS 29.212 V14.0.0 
+// AVP: AN-GW-Address (1050) 3GPP (10415)
+// 5.3.49
+type AVP_Address AN_GW_Address;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Resource-Allocation-Notification (1063) 3GPP (10415)
+// 5.3.50
+type enumerated Resource_Allocation_Notification
+{
+  ENABLE_NOTIFICATION (0)
+}
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Security-Parameter-Index (1056) 3GPP (10415)
+// 5.3.51
+type AVP_OctetString Security_Parameter_Index;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Flow-Label (1057) 3GPP (10415)
+// 5.3.52
+type AVP_OctetString Flow_Label;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Flow-Information (1058) 3GPP (10415)
+// 5.3.53
+type AVP_Grouped Flow_Information;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Packet-Filter-Content (1059) 3GPP (10415)
+// 5.3.54
+type AVP_IPFilterRule Packet_Filter_Content;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Packet-Filter-Identifier (1060) 3GPP (10415)
+// 5.3.55
+type AVP_OctetString Packet_Filter_Identifier;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Packet-Filter-Information (1061) 3GPP (10415)
+// 5.3.56
+type AVP_Grouped Packet_Filter_Information;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Packet-Filter-Operation (1062) 3GPP (10415)
+// 5.3.57
+type enumerated Packet_Filter_Operation
+{
+  DELETION  (0),
+  ADDITION  (1),
+  MODIFICATION (2)
+}
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: PDN-Connection-ID (1065) 3GPP (10415)
+// 5.3.58
+type AVP_OctetString PDN_Connection_ID;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Monitoring-Key (1066) 3GPP (10415)
+// 5.3.59
+type AVP_OctetString Monitoring_Key;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Usage-Monitoring-Information (1067) 3GPP (10415)
+// 5.3.60
+type AVP_Grouped Usage_Monitoring_Information;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Usage-Monitoring-Level (1068) 3GPP (10415)
+// 5.3.61
+type enumerated Usage_Monitoring_Level
+{
+  SESSION_LEVEL   (0),
+  PCC_RULE_LEVEL  (1),
+  ADC_RULE_LEVEL  (2)
+}
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Usage-Monitoring-Report (1069) 3GPP (10415)
+// 5.3.62
+type enumerated Usage_Monitoring_Report
+{
+  USAGE_MONITORING_REPORT_REQUIRED  (0)
+}
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Usage-Monitoring-Support (1070) 3GPP (10415)
+// 5.3.63
+type enumerated Usage_Monitoring_Support
+{
+  USAGE_MONITORING_DISABLED (0)
+}
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: CSG-Information-Reporting (1071) 3GPP (10415)
+// 5.3.64
+type enumerated CSG_Information_Reporting
+{
+  CHANGE_CSG_CELL                     (0),
+  CHANGE_CSG_SUBSCRIBED_HYBRID_CELL   (1),
+  CHANGE_CSG_UNSUBSCRIBED_HYBRID_CELL (2)
+}
+
+
+// 3GPP TS 29.212 V14.0.0 
+// AVP: Flow-Direction (1080) 3GPP (10415)
+// 5.3.65
+type enumerated Flow_Direction
+{
+  UNSPECIFIED                         (0),
+  DOWNLINK                            (1),
+  UPLINK                              (2),
+  BIDIRECTIONAL                       (3)
+}
+
+
+// 3GPP TS 29.212 V14.0.0 
+// AVP: Packet-Filter-Usage (1072) 3GPP (10415)
+// 5.3.66
+type enumerated Packet_Filter_Usage
+{
+  SEND_TO_UE (1)
+}
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Charging-Correlation-Indicator (1073) 3GPP (10415)
+// 5.3.67
+type enumerated Charging_Correlation_Indicator
+{
+  CHARGING_IDENTIFIER_REQUIRED   (0)
+}
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Routing-Rule-Install (1081) 3GPP (10415)
+// 5.3.68
+type AVP_Grouped Routing_Rule_Install;
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Routing-Rule-Remove (1075) 3GPP (10415)
+// 5.3.69
+type AVP_Grouped Routing_Rule_Remove;
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Routing-Rule-Definition (1076) 3GPP (10415)
+// 5.3.70
+type AVP_Grouped Routing_Rule_Definition;
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Routing-Rule-Identifier (1077) 3GPP (10415)
+// 5.3.71
+type AVP_OctetString Routing_Rule_Identifier;
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Routing-Filter (1078) 3GPP (10415)
+// 5.3.72
+type AVP_Grouped Routing_Filter;
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Routing-IP-Address (1079) 3GPP (10415)
+// 5.3.73
+type AVP_Address Routing_IP_Address;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: TDF-Application-Identifier (1088) 3GPP (10415)
+// 5.3.77
+type AVP_OctetString TDF_Application_Identifier;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: TDF-Information (1087) 3GPP (10415)
+// 5.3.78
+type AVP_Grouped TDF_Information;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: TDF-Destination-Realm (1090) 3GPP (10415)
+// 5.3.79
+type AVP_DiameterIdentity TDF_Destination_Realm;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: TDF-Destination-Host (1089) 3GPP (10415)
+// 5.3.80
+type AVP_DiameterIdentity TDF_Destination_Host;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: TDF-IP-Address (1091) 3GPP (10415)
+// 5.3.81
+type AVP_Address TDF_IP_Address;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Redirect-Information (1085) 3GPP (10415)
+// 5.3.82
+type AVP_Grouped Redirect_Information;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Redirect-Support (1086) 3GPP (10415)
+// 5.3.83
+type enumerated Redirect_Support
+{
+  REDIRECTION_DISABLED (0),
+  REDIRECTION_ENABLED (1)
+}
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: PS-to-CS-Session-Continuity (1099) 3GPP (10415)
+// 5.3.84
+type enumerated PS_to_CS_Session_Continuity
+{
+  VIDEO_PS2CS_CONT_CANDIDATE (0)
+}
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Application-Detection-Information (1098) 3GPP (10415)
+// 5.3.91
+type AVP_Grouped Application_Detection_Information;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: TDF-Application-Instance-Identifier (2802) 3GPP (10415)
+// 5.3.92
+type AVP_OctetString TDF_Application_Instance_Identifier;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: HeNB-Local-IP-Address (2804) 3GPP (10415)
+// 5.3.95
+type AVP_Address HeNB_Local_IP_Address;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: UE-Local-IP-Address (2805) 3GPP (10415)
+// 5.3.96
+type AVP_Address UE_Local_IP_Address;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: UDP-Source-Port (2806) 3GPP (10415)
+// 5.3.97
+type AVP_Unsigned32 UDP_Source_Port;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Mute-Notification (2809) 3GPP (10415)
+// 5.3.98
+type enumerated Mute_Notification
+{
+  MUTE_REQUIRED (0)
+}
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Monitoring-Time (2810) 3GPP (10415)
+// 5.3.99
+type AVP_Time Monitoring_Time;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: AN-GW-Status (2811) 3GPP (10415)
+// 5.3.100
+type enumerated AN_GW_Status
+{
+  AN_GW_FAILED (0)
+}
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: User-Location-Info-Time (2812) 3GPP (10415)
+// 5.3.101
+type AVP_Time User_Location_Info_Time;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Credit-Management-Status (1082) 3GPP (10415)
+// 5.3.102
+type AVP_Unsigned32 Credit_Management_Status;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Default-QoS-Information (2816) 3GPP (10415)
+// 5.3.103
+type AVP_Grouped Default_QoS_Information;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Default-QoS-Name (2817) 3GPP (10415)
+// 5.3.104
+type AVP_UTF8String Default_QoS_Name;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Conditional-APN-Aggregate-Max-Bitrate (2818) 3GPP (10415)
+// 5.3.105
+type AVP_Grouped Conditional_APN_Aggregate_Max_Bitrate;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: RAN-NAS-Release-Cause (2819) 3GPP (10415)
+// 5.3.106
+type AVP_OctetString RAN_NAS_Release_Cause;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Presence-Reporting-Area-Elements-List (2820) 3GPP (10415)
+// 5.3.107
+type AVP_OctetString Presence_Reporting_Area_Elements_List;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Presence-Reporting-Area-Identifier (2821) 3GPP (10415)
+// 5.3.108
+type AVP_OctetString Presence_Reporting_Area_Identifier;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Presence-Reporting-Area-Information (2822) 3GPP (10415)
+// 5.3.109
+type AVP_Grouped Presence_Reporting_Area_Information;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Presence-Reporting-Area-Status (2823) 3GPP (10415)
+// 5.3.110
+type AVP_Unsigned32 Presence_Reporting_Area_Status;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: NetLoc-Access-Support (2824) 3GPP (10415)
+// 5.3.111
+type AVP_Unsigned32 NetLoc_Access_Support;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Fixed-User-Location-Info (2825) 3GPP (10415)
+// 5.3.112
+type AVP_Grouped Fixed_User_Location_Info;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: PCSCF-Restoration-Indication (2826) 3GPP (10415)
+// 5.3.113
+type AVP_Unsigned32 PCSCF_Restoration_Indication;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: IP-CAN-Session-Charging-Scope (2827) 3GPP (10415)
+// 5.3.114
+type enumerated IP_CAN_Session_Charging_Scope
+{
+  IP_CAN_SESSION_SCOPE (0)
+}
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Monitoring-Flags (2828) 3GPP (10415)
+// 5.3.115
+type AVP_Unsigned32 Monitoring_Flags;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: NBIFOM-Support (2831) 3GPP (10415)
+// 5.3.116
+type enumerated NBIFOM_Support
+{
+  NBIFOM_NOT_SUPPORTED (0),
+  NBIFOM_SUPPORTED (1)
+}
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: NBIFOM-Mode (2830) 3GPP (10415)
+// 5.3.117
+type enumerated NBIFOM_Mode
+{
+  UE_INITIATED (0),
+  NETWORK_INITIATED (1)
+}
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Routing-Rule-Report (2835) 3GPP (10415)
+// 5.3.118
+type AVP_Grouped Routing_Rule_Report;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Routing-Rule-Failure-Code (2834) 3GPP (10415)
+// 5.3.119
+type AVP_Unsigned32 Routing_Rule_Failure_Code;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Default-Access (2829) 3GPP (10415)
+// 5.3.120
+type enumerated Default_Access
+{
+  threeGPP_GPRS (0),
+  DOCSIS        (1),
+  xDSL          (2),
+  WiMAX         (3),
+  threeGPP2     (4),
+  threeGPP_EPS  (5),
+  Non_threeGPP_EPS  (6),
+  FBA           (7)
+}
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Access-Availability-Change-Reason (2833) 3GPP (10415)
+// 5.3.121
+type AVP_Unsigned32 Access_Availability_Change_Reason;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: RAN-Rule-Support (2832) 3GPP (10415)
+// 5.3.122
+type AVP_Unsigned32 RAN_Rule_Support;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Traffic-Steering-Policy-Identifier-DL (2836) 3GPP (10415)
+// 5.3.123
+type AVP_OctetString Traffic_Steering_Policy_Identifier_DL;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Traffic-Steering-Policy-Identifier-UL (2837) 3GPP (10415)
+// 5.3.124
+type AVP_OctetString Traffic_Steering_Policy_Identifier_UL;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Resource-Release-Notification (2841) 3GPP (10415)
+// 5.3.125
+type enumerated Resource_Release_Notification
+{
+  ENABLE_NOTIFICATION (0)
+}
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Removal-Of-Access (2842) 3GPP (10415)
+// 5.3.126
+type enumerated Removal_Of_Access
+{
+  REMOVAL_OF_ACCESS (0)
+}
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Execution-Time (2839) 3GPP (10415)
+// 5.3.127
+type AVP_Time Execution_Time;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Conditional-Policy-Information (2840) 3GPP (10415)
+// 5.3.128
+type AVP_Grouped Conditional_Policy_Information;
+
+
+// Gxx specific AVPs
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: QoS-Rule-Install (1051) 3GPP (10415)
+// 5a.3.1
+type AVP_Grouped QoS_Rule_Install;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: QoS-Rule-Remove (1052) 3GPP (10415)
+// 5a.3.2
+type AVP_Grouped QoS_Rule_Remove;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: QoS-Rule-Definition (1053) 3GPP (10415)
+// 5a.3.3
+type AVP_Grouped QoS_Rule_Definition;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: QoS-Rule-Name (1054) 3GPP (10415)
+// 5a.3.4
+type AVP_OctetString QoS_Rule_Name;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: QoS-Rule-Report (1055) 3GPP (10415)
+// 5a.3.5
+type AVP_Grouped QoS_Rule_Report;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: Session-Linking-Indicator (1064) 3GPP (10415)
+// 5a.3.6
+type enumerated Session_Linking_Indicator
+{
+  SESSION_LINKING_IMMEDIATE (0),
+  SESSION_LINKING_DEFERRED  (1),
+  SESSION_LINKING_INVALID   (100)  //Requested for negative testing in CR_TR00019832.
+}
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: QoS-Rule-Base-Name (1074) 3GPP (10415)
+// 5a.3.7
+type AVP_UTF8String QoS_Rule_Base_Name;
+
+
+// Sd specific AVPs
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: ADC-Rule-Install (1092) 3GPP (10415)
+// 5b.3.1
+type AVP_Grouped ADC_Rule_Install;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: ADC-Rule-Remove (1093) 3GPP (10415)
+// 5b.3.2
+type AVP_Grouped ADC_Rule_Remove;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: ADC-Rule-Definition (1094) 3GPP (10415)
+// 5b.3.3
+type AVP_Grouped ADC_Rule_Definition;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: ADC-Rule-Base-Name (1095) 3GPP (10415)
+// 5b.3.4
+type AVP_UTF8String ADC_Rule_Base_Name;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: ADC-Rule-Name (1096) 3GPP (10415)
+// 5b.3.5
+type AVP_OctetString ADC_Rule_Name;
+
+
+// 3GPP TS 29.212 V14.0.0
+// AVP: ADC-Rule-Report (1097) 3GPP (10415)
+// 5b.3.6
+type AVP_Grouped ADC_Rule_Report;
+
diff --git a/src/GxInterface_PCC_3GPP_TS29212_f10.ddf b/src/GxInterface_PCC_3GPP_TS29212_f10.ddf
new file mode 100644
index 0000000000000000000000000000000000000000..5370bc1c59da961dbb44ad6f5749e626768cc2d1
--- /dev/null
+++ b/src/GxInterface_PCC_3GPP_TS29212_f10.ddf
@@ -0,0 +1,1128 @@
+/******************************************************************************
+* Copyright (c) 2004, 2018  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:               GxInterface_PCC_3GPP_TS29212_f10.ddf
+//  Description:        DDF for Gx Gxx and Sd according to 3GPP TS 29.212 V15.1.0
+//  Rev:                R55A
+//  Prodnr:             CNL 113 462
+///////////////////////////////////////////////
+
+
+// APPLICATION-NAME: PCC
+// APPLICATION-REVISION: Vf_1_0
+
+// AVP implementations according to: 
+// 3GPP TS 29.212 V15.1.0 - Policy and Charging Control over Gx interface
+//
+//
+// Dependant applications 
+// IETF RFC 3588   - Diameter Base Protocol
+// IETF RFC 4005   - Diameter Network Address Server
+// IETF RFC 4006   - Diameter Credit Control Application
+// 3GPP TS 29.061  - Interworking between the Public Land Mobile Network (PLMN) supporting packet based services and Packet Data Networks (PDN)
+// 3GPP TS 29.214  - Policy and Charging Control over Rx reference points
+// 3GPP TS 29.229  - Cx and Dx interfaces based on the Diameter protocol
+// 3GPP TS 29.272  - EPS; MME and SGSN related interfaces based on Diameter protocol
+// 3GPP2 X.S0057-O - (3GPP2-BSID AVP reused for Gx and Gxx interface)
+// 3GPP TS 32.299  - Telecommunication manegement; Charging management; Diameter charging applications
+//
+// Notes: 
+// Present application is based on 3GPP TS 29.210 V6.7.0 but has its own vendor 
+// specific Diameter application with application id for the Gx Application : 16777238
+// Application-ID for the Gxx Application is 16777266
+// Application-ID for the Sd Application is 16777303
+
+// 3GPP TS 29.212 V15.1.0
+// 5.6, 5b.6, 5c.6 
+type enumerated Command_Code {
+  Credit_Control (272),
+  Re_Auth        (258),
+  TDF_Session    (8388637)
+}
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Bearer-Usage (1000) 3GPP (10415)
+// 5.3.1
+type enumerated Bearer_Usage
+{
+  GENERAL        (0),
+  IMS_SIGNALLING (1)
+}
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Charging-Rule-Install (1001) 3GPP (10415)
+// 5.3.2
+type AVP_Grouped Charging_Rule_Install;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Charging-Rule-Remove (1002) 3GPP (10415)
+// 5.3.3
+type AVP_Grouped Charging_Rule_Remove;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Charging-Rule-Definition (1003) 3GPP (10415)
+// 5.3.4
+type AVP_Grouped Charging_Rule_Definition;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Charging-Rule-Base-Name (1004) 3GPP (10415)
+// 5.3.5
+type AVP_UTF8String Charging_Rule_Base_Name;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Charging-Rule-Name (1005) 3GPP (10415)
+// 5.3.6
+type AVP_OctetString Charging_Rule_Name;
+
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Event-Trigger (1006) 3GPP (10415)
+// 5.3.7
+type enumerated Event_Trigger
+{
+  SGSN_CHANGE                         (0),
+  QOS_CHANGE                          (1),
+  RAT_CHANGE                          (2),
+  TFT_CHANGE                          (3),
+  PLMN_CHANGE                         (4),
+  LOSS_OF_BEARER                      (5),
+  RECOVERY_OF_BEARER                  (6),
+  IP_CAN_CHANGE                       (7),
+  QOS_CHANGE_EXCEEDING_AUTHORIZATION (11),
+  RAI_CHANGE                         (12),
+  USER_LOCATION_CHANGE               (13),
+  NO_EVENT_TRIGGERS                  (14),
+  OUT_OF_CREDIT                      (15),
+  REALLOCATION_OF_CREDIT             (16),
+  REVALIDATION_TIMEOUT               (17),
+  UE_IP_ADDRESS_ALLOCATE             (18),
+  UE_IP_ADDRESS_RELEASE              (19),
+  DEFAULT_EPS_BEARER_QOS_CHANGE      (20),
+  AN_GW_CHANGE                       (21),
+  SUCCESSFUL_RESOURCE_ALLOCATION     (22),
+  RESOURCE_MODIFICATION_REQUEST      (23),
+  PGW_TRACE_CONTROL                  (24),
+  UE_TIME_ZONE_CHANGE                (25),
+  TAI_CHANGE                         (26),
+  ECGI_CHANGE                        (27),
+  CHARGING_CORRELATION_EXCHANGE      (28),
+  APN_AMBR_MODIFICATION_FAILURE      (29),  
+  USER_CSG_INFORMATION_CHANGE        (30),
+  USAGE_REPORT                       (33),
+  DEFAULT_EPS_BEARER_QOS_MODIFICATION_FAILURE (34),
+  USER_CSG_HYBRID_SUBSCRIBED_INFORMATION_CHANGE (35),
+  USER_CSG_HYBRID_UNSUBSCRIBED_INFORMATION_CHANGE (36),
+  ROUTING_RULE_CHANGE                (37),
+  APPLICATION_START                  (39),
+  APPLICATION_STOP                   (40),
+  CS_TO_PS_HANDOVER                  (42),
+  UE_LOCAL_IP_ADDRESS_CHANGE         (43),
+  HENB_LOCAL_IP_ADDRESS_CHANGE       (44),
+  ACCESS_NETWORK_INFO_REPORT         (45),
+  CREDIT_MANAGEMENT_SESSION_FAILURE  (46),
+  DEFAULT_QOS_CHANGE                 (47),
+  CHANGE_OF_UE_PRESENCE_IN_PRESENCE_REPORTING_AREA_REPORT (48),
+  ADDITION_OF_ACCESS                 (49),
+  REMOVAL_OF_ACCESS                  (50),
+  UNAVAILABLITY_OF_ACCESS            (51),
+  AVAILABLITY_OF_ACCESS              (52),
+  RESOURCE_RELEASE                   (53),
+  ENODEB_CHANGE                      (54),
+  THREEGPP_PS_DATA_OFF_CHANGE        (55)
+}
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Metering-Method (1007) 3GPP (10415)
+// 5.3.8
+type enumerated Metering_Method
+{
+  DURATION            (0),
+  VOLUME              (1),
+  DURATION_VOLUME     (2),
+  EVENT               (3)
+}
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Offline (1008) 3GPP (10415)
+// 5.3.9
+type enumerated Offline
+{
+  DISABLE_OFFLINE     (0),
+  ENABLE_OFFLINE      (1)
+}
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Online (1009) 3GPP (10415)
+// 5.3.10
+type enumerated Online
+{
+  DISABLE_ONLINE      (0),
+  ENABLE_ONLINE       (1)
+}
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Precedence (1010) 3GPP (10415)
+// 5.3.11
+type AVP_Unsigned32 Precedence;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Reporting-Level (1011) 3GPP (10415)
+// 5.3.12
+type enumerated Reporting_Level
+{
+  SERVICE_IDENTIFIER_LEVEL (0),
+  RATING_GROUP_LEVEL       (1),
+  SPONSORED_CONNECTIVITY_LEVEL (2)
+}
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: TFT-Filter (1012) 3GPP (10415)
+// 5.3.13
+type AVP_IPFilterRule TFT_Filter;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: TFT-Packet-Filter-Information (1013) 3GPP (10415)
+// 5.3.14
+type AVP_Grouped TFT_Packet_Filter_Information;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: ToS-Traffic-Class (1014) 3GPP (10415)
+// 5.3.15
+type AVP_OctetString ToS_Traffic_Class;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: QoS-Information (1016) 3GPP (10415)
+// 5.3.16
+type AVP_Grouped QoS_Information;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: QoS-Class-Identifier (1028) 3GPP (10415)
+// 5.3.17
+type AVP_Unsigned32 QoS_Class_Identifier;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Charging-Rule-Report (1018) 3GPP (10415)
+// 5.3.18
+type AVP_Grouped Charging_Rule_Report;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: PCC-Rule-Status (1019) 3GPP (10415)
+// 5.3.19
+type enumerated PCC_Rule_Status
+{
+  ACTIVE               (0),
+  INACTIVE             (1),
+  TEMPORARILY_INACTIVE (2)  
+}
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Bearer-Identifier (1020) 3GPP (10415)
+// 5.3.20
+type AVP_OctetString Bearer_Identifier;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Bearer-Operation (1021) 3GPP (10415)
+// 5.3.21
+type enumerated Bearer_Operation
+{
+  TERMINATION   (0),
+  ESTABLISHMENT (1),
+  MODIFICATION  (2)
+}
+
+
+// 3GPP TS 29.212 V15.1.0 
+// AVP: Access-Network-Charging-Identifier-Gx (1022) 3GPP (10415)
+// 5.3.22
+type AVP_Grouped Access_Network_Charging_Identifier_Gx;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Bearer-Control-Mode (1023) 3GPP (10415)
+// 5.3.23
+type enumerated Bearer_Control_Mode
+{
+  UE_ONLY  (0),
+  RESERVED (1),
+  UE_NW    (2),
+  SX_GX    (3),
+  SX_ONLY  (4)
+}
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Network-Request-Support (1024) 3GPP (10415)
+// 5.3.24
+type enumerated Network_Request_Support
+{
+  NETWORK_REQUEST_NOT_SUPPORTED (0),
+  NETWORK_REQUEST_SUPPORTED (1) 
+}
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Guaranteed-Bitrate-DL (1025) 3GPP (10415)
+// 5.3.25
+type AVP_Unsigned32 Guaranteed_Bitrate_DL;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Guaranteed-Bitrate-UL (1026) 3GPP (10415)
+// 5.3.26
+type AVP_Unsigned32 Guaranteed_Bitrate_UL;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: IP-CAN-Type (1027) 3GPP (10415)
+// 5.3.27
+type enumerated IP_CAN_Type
+{
+  threeGPP_GPRS (0),
+  DOCSIS        (1),
+  xDSL          (2),
+  WiMAX         (3),
+  threeGPP2     (4),
+  threeGPP_EPS  (5),
+  Non_threeGPP_EPS  (6),
+  FBA           (7)
+}
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: QoS-Negotiation (1029) 3GPP (10415)
+// 5.3.28
+type enumerated QoS_Negotiation
+{
+  NO_QoS_NEGOTIATION        (0),
+  QoS_NEGOTIATION_SUPPORTED (1)
+}
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: QoS-Upgrade (1030) 3GPP (10415)
+// 5.3.29
+type enumerated QoS_Upgrade
+{
+  QoS_UPGRADE_NOT_SUPPORTED (0),
+  QoS_UPGRADE_SUPPORTED     (1)
+}
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Event-Report-Indication (1033) 3GPP (10415)
+// 5.3.30
+type AVP_Grouped Event_Report_Indication;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: RAT-Type (1032) 3GPP (10415)
+// 5.3.31
+type enumerated RAT_Type 
+{
+  WLAN              (0),
+  VIRTUAL           (1),
+  UTRAN          (1000),
+  GERAN          (1001),
+  GAN            (1002),
+  HSPA_EVOLUTION (1003),
+  EUTRAN         (1004),
+  EUTRAN_NB_IoT  (1005),
+  CDMA2000_1X    (2000),
+  HRPD           (2001),
+  UMB            (2002),
+  EHRPD          (2003)
+}
+
+
+// 3GPP TS 29.212 V15.1.0 
+// AVP: Allocation-Retention-Priority (1034) 3GPP (10415)
+// 5.3.32
+type AVP_Grouped Allocation_Retention_Priority;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: CoA-IP-Address (1035) 3GPP (10415)
+// 5.3.33
+type AVP_Address CoA_IP_Address;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Tunnel-Header-Filter (1036) 3GPP (10415)
+// 5.3.34
+type AVP_IPFilterRule Tunnel_Header_Filter;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Tunnel-Header-Length (1037) 3GPP (10415)
+// 5.3.35
+type AVP_Unsigned32 Tunnel_Header_Length;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Tunnel-Information (1038) 3GPP (10415)
+// 5.3.36
+type AVP_Grouped Tunnel_Information;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: CoA-Information (1039) 3GPP (10415)
+// 5.3.37
+type AVP_Grouped CoA_Information;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Rule-Failure-Code (1031) 3GPP (10415)
+// 5.3.38
+type enumerated Rule_Failure_Code
+{
+  UNKNOWN_RULE_NAME                     (1),
+  RATING_GROUP_ERROR                    (2),
+  SERVICE_IDENTIFIER_ERROR              (3),
+  GW_PCEF_MALFUNCTION                   (4),
+  RESOURCES_LIMITATION                  (5),
+  MAX_NR_BEARERS_REACHED                (6),
+  UNKNOWN_BEARER_ID                     (7),
+  MISSING_BEARER_ID                     (8),
+  MISSING_FLOW_DESCRIPTION              (9),
+  RESOURCE_ALLOCATION_FAILURE           (10),
+  UNSUCCESSFUL_QOS_VALIDATION           (11),
+  INCORRECT_FLOW_INFORMATION            (12),
+  PS_TO_CS_HANDOVER                     (13),
+  TDF_APPLICATION_IDENTIFIER_ERROR      (14),
+  NO_BEARER_BOUND                       (15),
+  FILTER_RESTRICTIONS                   (16),
+  AN_GW_FAILED                          (17),
+  MISSING_REDIRECT_SERVER_ADDRESS       (18),
+  CM_END_USER_SERVICE_DENIED            (19),
+  CM_CREDIT_CONTROL_NOT_APPLICABLE      (20),
+  CM_AUTHORIZATION_REJECTED             (21),
+  CM_USER_UNKNOWN                       (22),
+  CM_RATING_FAILED                      (23),
+  ROUTING_RULE_REJECTION                (24),
+  UNKNOWN_ROUTING_ACCESS_INFORMATION    (25),
+  NO_NBIFOM_SUPPORT                     (26)  // the standard defines as 25, which doesn't seem to be correct
+}
+
+
+// 3GPP TS 29.212 V15.1.0 
+// AVP: APN-Aggregate-Max-Bitrate-DL (1040) 3GPP (10415)
+// 5.3.39
+type AVP_Unsigned32 APN_Aggregate_Max_Bitrate_DL;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: APN-Aggregate-Max-Bitrate-UL (1041) 3GPP (10415)
+// 5.3.40
+type AVP_Unsigned32 APN_Aggregate_Max_Bitrate_UL;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Revalidation-Time (1042) 3GPP (10415)
+// 5.3.41
+type AVP_Time Revalidation_Time;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Rule-Activation-Time (1043) 3GPP (10415)
+// 5.3.42
+type AVP_Time Rule_Activation_Time;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Rule-DeActivation-Time (1044) 3GPP (10415)
+// 5.3.43
+type AVP_Time Rule_DeActivation_Time;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Session-Release-Cause (1045) 3GPP (10415)
+// 5.3.44
+type enumerated Session_Release_Cause
+{
+  UNSPECIFIED_REASON            (0),
+  UE_SUBSCRIPTION_REASON        (1),
+  INSUFFICIENT_SERVER_RESOURCES (2),
+  IP_CAN_SESSION_TERMINATION    (3),
+  UE_IP_ADDRESS_RELEASE         (4)
+}
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Priority-Level (1046) 3GPP (10415)
+// 5.3.45
+type AVP_Unsigned32 Priority_Level;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Pre-emption-Capability (1047) 3GPP (10415)
+// 5.3.46
+type enumerated Pre_emption_Capability
+{
+  PRE_EMPTION_CAPABILITY_ENABLED  (0),
+  PRE_EMPTION_CAPABILITY_DISABLED (1)
+}
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Pre-emption-Vulnerability (1048) 3GPP (10415)
+// 5.3.47
+type enumerated Pre_emption_Vulnerability
+{
+  PRE_EMPTION_VULNERABILITY_ENABLED  (0),
+  PRE_EMPTION_VULNERABILITY_DISABLED (1)
+}
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Default-EPS-Bearer-QoS (1049) 3GPP (10415)
+// 5.3.48
+type AVP_Grouped Default_EPS_Bearer_QoS;
+
+
+// 3GPP TS 29.212 V15.1.0 
+// AVP: AN-GW-Address (1050) 3GPP (10415)
+// 5.3.49
+type AVP_Address AN_GW_Address;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Resource-Allocation-Notification (1063) 3GPP (10415)
+// 5.3.50
+type enumerated Resource_Allocation_Notification
+{
+  ENABLE_NOTIFICATION (0)
+}
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Security-Parameter-Index (1056) 3GPP (10415)
+// 5.3.51
+type AVP_OctetString Security_Parameter_Index;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Flow-Label (1057) 3GPP (10415)
+// 5.3.52
+type AVP_OctetString Flow_Label;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Flow-Information (1058) 3GPP (10415)
+// 5.3.53
+type AVP_Grouped Flow_Information;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Packet-Filter-Content (1059) 3GPP (10415)
+// 5.3.54
+type AVP_IPFilterRule Packet_Filter_Content;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Packet-Filter-Identifier (1060) 3GPP (10415)
+// 5.3.55
+type AVP_OctetString Packet_Filter_Identifier;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Packet-Filter-Information (1061) 3GPP (10415)
+// 5.3.56
+type AVP_Grouped Packet_Filter_Information;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Packet-Filter-Operation (1062) 3GPP (10415)
+// 5.3.57
+type enumerated Packet_Filter_Operation
+{
+  DELETION  (0),
+  ADDITION  (1),
+  MODIFICATION (2)
+}
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: PDN-Connection-ID (1065) 3GPP (10415)
+// 5.3.58
+type AVP_OctetString PDN_Connection_ID;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Monitoring-Key (1066) 3GPP (10415)
+// 5.3.59
+type AVP_OctetString Monitoring_Key;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Usage-Monitoring-Information (1067) 3GPP (10415)
+// 5.3.60
+type AVP_Grouped Usage_Monitoring_Information;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Usage-Monitoring-Level (1068) 3GPP (10415)
+// 5.3.61
+type enumerated Usage_Monitoring_Level
+{
+  SESSION_LEVEL   (0),
+  PCC_RULE_LEVEL  (1),
+  ADC_RULE_LEVEL  (2)
+}
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Usage-Monitoring-Report (1069) 3GPP (10415)
+// 5.3.62
+type enumerated Usage_Monitoring_Report
+{
+  USAGE_MONITORING_REPORT_REQUIRED  (0)
+}
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Usage-Monitoring-Support (1070) 3GPP (10415)
+// 5.3.63
+type enumerated Usage_Monitoring_Support
+{
+  USAGE_MONITORING_DISABLED (0)
+}
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: CSG-Information-Reporting (1071) 3GPP (10415)
+// 5.3.64
+type enumerated CSG_Information_Reporting
+{
+  CHANGE_CSG_CELL                     (0),
+  CHANGE_CSG_SUBSCRIBED_HYBRID_CELL   (1),
+  CHANGE_CSG_UNSUBSCRIBED_HYBRID_CELL (2)
+}
+
+
+// 3GPP TS 29.212 V15.1.0 
+// AVP: Flow-Direction (1080) 3GPP (10415)
+// 5.3.65
+type enumerated Flow_Direction
+{
+  UNSPECIFIED                         (0),
+  DOWNLINK                            (1),
+  UPLINK                              (2),
+  BIDIRECTIONAL                       (3)
+}
+
+
+// 3GPP TS 29.212 V15.1.0 
+// AVP: Packet-Filter-Usage (1072) 3GPP (10415)
+// 5.3.66
+type enumerated Packet_Filter_Usage
+{
+  SEND_TO_UE (1)
+}
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Charging-Correlation-Indicator (1073) 3GPP (10415)
+// 5.3.67
+type enumerated Charging_Correlation_Indicator
+{
+  CHARGING_IDENTIFIER_REQUIRED   (0)
+}
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Routing-Rule-Install (1081) 3GPP (10415)
+// 5.3.68
+type AVP_Grouped Routing_Rule_Install;
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Routing-Rule-Remove (1075) 3GPP (10415)
+// 5.3.69
+type AVP_Grouped Routing_Rule_Remove;
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Routing-Rule-Definition (1076) 3GPP (10415)
+// 5.3.70
+type AVP_Grouped Routing_Rule_Definition;
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Routing-Rule-Identifier (1077) 3GPP (10415)
+// 5.3.71
+type AVP_OctetString Routing_Rule_Identifier;
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Routing-Filter (1078) 3GPP (10415)
+// 5.3.72
+type AVP_Grouped Routing_Filter;
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Routing-IP-Address (1079) 3GPP (10415)
+// 5.3.73
+type AVP_Address Routing_IP_Address;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: TDF-Application-Identifier (1088) 3GPP (10415)
+// 5.3.77
+type AVP_OctetString TDF_Application_Identifier;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: TDF-Information (1087) 3GPP (10415)
+// 5.3.78
+type AVP_Grouped TDF_Information;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: TDF-Destination-Realm (1090) 3GPP (10415)
+// 5.3.79
+type AVP_DiameterIdentity TDF_Destination_Realm;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: TDF-Destination-Host (1089) 3GPP (10415)
+// 5.3.80
+type AVP_DiameterIdentity TDF_Destination_Host;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: TDF-IP-Address (1091) 3GPP (10415)
+// 5.3.81
+type AVP_Address TDF_IP_Address;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Redirect-Information (1085) 3GPP (10415)
+// 5.3.82
+type AVP_Grouped Redirect_Information;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Redirect-Support (1086) 3GPP (10415)
+// 5.3.83
+type enumerated Redirect_Support
+{
+  REDIRECTION_DISABLED (0),
+  REDIRECTION_ENABLED (1)
+}
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: PS-to-CS-Session-Continuity (1099) 3GPP (10415)
+// 5.3.84
+type enumerated PS_to_CS_Session_Continuity
+{
+  VIDEO_PS2CS_CONT_CANDIDATE (0)
+}
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Application-Detection-Information (1098) 3GPP (10415)
+// 5.3.91
+type AVP_Grouped Application_Detection_Information;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: TDF-Application-Instance-Identifier (2802) 3GPP (10415)
+// 5.3.92
+type AVP_OctetString TDF_Application_Instance_Identifier;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: HeNB-Local-IP-Address (2804) 3GPP (10415)
+// 5.3.95
+type AVP_Address HeNB_Local_IP_Address;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: UE-Local-IP-Address (2805) 3GPP (10415)
+// 5.3.96
+type AVP_Address UE_Local_IP_Address;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: UDP-Source-Port (2806) 3GPP (10415)
+// 5.3.97
+type AVP_Unsigned32 UDP_Source_Port;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Mute-Notification (2809) 3GPP (10415)
+// 5.3.98
+type enumerated Mute_Notification
+{
+  MUTE_REQUIRED (0)
+}
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Monitoring-Time (2810) 3GPP (10415)
+// 5.3.99
+type AVP_Time Monitoring_Time;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: AN-GW-Status (2811) 3GPP (10415)
+// 5.3.100
+type enumerated AN_GW_Status
+{
+  AN_GW_FAILED (0)
+}
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: User-Location-Info-Time (2812) 3GPP (10415)
+// 5.3.101
+type AVP_Time User_Location_Info_Time;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Credit-Management-Status (1082) 3GPP (10415)
+// 5.3.102
+type AVP_Unsigned32 Credit_Management_Status;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Default-QoS-Information (2816) 3GPP (10415)
+// 5.3.103
+type AVP_Grouped Default_QoS_Information;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Default-QoS-Name (2817) 3GPP (10415)
+// 5.3.104
+type AVP_UTF8String Default_QoS_Name;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Conditional-APN-Aggregate-Max-Bitrate (2818) 3GPP (10415)
+// 5.3.105
+type AVP_Grouped Conditional_APN_Aggregate_Max_Bitrate;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: RAN-NAS-Release-Cause (2819) 3GPP (10415)
+// 5.3.106
+type AVP_OctetString RAN_NAS_Release_Cause;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Presence-Reporting-Area-Elements-List (2820) 3GPP (10415)
+// 5.3.107
+type AVP_OctetString Presence_Reporting_Area_Elements_List;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Presence-Reporting-Area-Identifier (2821) 3GPP (10415)
+// 5.3.108
+type AVP_OctetString Presence_Reporting_Area_Identifier;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Presence-Reporting-Area-Information (2822) 3GPP (10415)
+// 5.3.109
+type AVP_Grouped Presence_Reporting_Area_Information;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Presence-Reporting-Area-Status (2823) 3GPP (10415)
+// 5.3.110
+type AVP_Unsigned32 Presence_Reporting_Area_Status;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: NetLoc-Access-Support (2824) 3GPP (10415)
+// 5.3.111
+type AVP_Unsigned32 NetLoc_Access_Support;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Fixed-User-Location-Info (2825) 3GPP (10415)
+// 5.3.112
+type AVP_Grouped Fixed_User_Location_Info;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: PCSCF-Restoration-Indication (2826) 3GPP (10415)
+// 5.3.113
+type AVP_Unsigned32 PCSCF_Restoration_Indication;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: IP-CAN-Session-Charging-Scope (2827) 3GPP (10415)
+// 5.3.114
+type enumerated IP_CAN_Session_Charging_Scope
+{
+  IP_CAN_SESSION_SCOPE (0)
+}
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Monitoring-Flags (2828) 3GPP (10415)
+// 5.3.115
+type AVP_Unsigned32 Monitoring_Flags;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: NBIFOM-Support (2831) 3GPP (10415)
+// 5.3.116
+type enumerated NBIFOM_Support
+{
+  NBIFOM_NOT_SUPPORTED (0),
+  NBIFOM_SUPPORTED (1)
+}
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: NBIFOM-Mode (2830) 3GPP (10415)
+// 5.3.117
+type enumerated NBIFOM_Mode
+{
+  UE_INITIATED (0),
+  NETWORK_INITIATED (1)
+}
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Routing-Rule-Report (2835) 3GPP (10415)
+// 5.3.118
+type AVP_Grouped Routing_Rule_Report;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Routing-Rule-Failure-Code (2834) 3GPP (10415)
+// 5.3.119
+type AVP_Unsigned32 Routing_Rule_Failure_Code;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Default-Access (2829) 3GPP (10415)
+// 5.3.120
+type enumerated Default_Access
+{
+  threeGPP_GPRS (0),
+  DOCSIS        (1),
+  xDSL          (2),
+  WiMAX         (3),
+  threeGPP2     (4),
+  threeGPP_EPS  (5),
+  Non_threeGPP_EPS  (6),
+  FBA           (7)
+}
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Access-Availability-Change-Reason (2833) 3GPP (10415)
+// 5.3.121
+type AVP_Unsigned32 Access_Availability_Change_Reason;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: RAN-Rule-Support (2832) 3GPP (10415)
+// 5.3.122
+type AVP_Unsigned32 RAN_Rule_Support;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Traffic-Steering-Policy-Identifier-DL (2836) 3GPP (10415)
+// 5.3.123
+type AVP_OctetString Traffic_Steering_Policy_Identifier_DL;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Traffic-Steering-Policy-Identifier-UL (2837) 3GPP (10415)
+// 5.3.124
+type AVP_OctetString Traffic_Steering_Policy_Identifier_UL;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Resource-Release-Notification (2841) 3GPP (10415)
+// 5.3.125
+type enumerated Resource_Release_Notification
+{
+  ENABLE_NOTIFICATION (0)
+}
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Removal-Of-Access (2842) 3GPP (10415)
+// 5.3.126
+type enumerated Removal_Of_Access
+{
+  REMOVAL_OF_ACCESS (0)
+}
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Execution-Time (2839) 3GPP (10415)
+// 5.3.127
+type AVP_Time Execution_Time;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Conditional-Policy-Information (2840) 3GPP (10415)
+// 5.3.128
+type AVP_Grouped Conditional_Policy_Information;
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: TCP-Source-Port (2843) 3GPP (10415)
+// 5.3.129
+type AVP_Unsigned32 TCP_Source_Port;
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: PRA-Install (2845) 3GPP (10415)
+// 5.3.130
+type AVP_Grouped PRA_Install;
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: PRA-Remove (2846) 3GPP (10415)
+// 5.3.131
+type AVP_Grouped PRA_Remove;
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Default-Bearer-Indication (2844) 3GPP (10415)
+// 5.3.132
+type enumerated Default_Bearer_Indication
+{
+  BIND_TO_DEF_BEARER        (0),
+  BIND_TO_APPLICABLE_BEARER (1)
+}
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: 3GPP-PS-Data-Off-Status (2847) 3GPP (10415)
+// 5.3.133
+type enumerated 3GPP_PS_Data_Off_Status
+{
+   ACTIVE     (0),
+   INACTIVE   (1)
+}
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Extended-APN-AMBR-DL (2848) 3GPP (10415)
+// 5.3.134
+type AVP_Unsigned32 Extended_APN_AMBR_DL;
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Extended-APN-AMBR-UL (2849) 3GPP (10415)
+// 5.3.135
+type AVP_Unsigned32 Extended_APN_AMBR_UL;
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Extended-GBR-DL (2850) 3GPP (10415)
+// 5.3.136
+type AVP_Unsigned32 Extended_GBR_DL;
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Extended-GBR-UL (2851) 3GPP (10415)
+// 5.3.137
+type AVP_Unsigned32 Extended_GBR_UL;
+
+
+// Gxx specific AVPs
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: QoS-Rule-Install (1051) 3GPP (10415)
+// 5a.3.1
+type AVP_Grouped QoS_Rule_Install;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: QoS-Rule-Remove (1052) 3GPP (10415)
+// 5a.3.2
+type AVP_Grouped QoS_Rule_Remove;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: QoS-Rule-Definition (1053) 3GPP (10415)
+// 5a.3.3
+type AVP_Grouped QoS_Rule_Definition;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: QoS-Rule-Name (1054) 3GPP (10415)
+// 5a.3.4
+type AVP_OctetString QoS_Rule_Name;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: QoS-Rule-Report (1055) 3GPP (10415)
+// 5a.3.5
+type AVP_Grouped QoS_Rule_Report;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: Session-Linking-Indicator (1064) 3GPP (10415)
+// 5a.3.6
+type enumerated Session_Linking_Indicator
+{
+  SESSION_LINKING_IMMEDIATE (0),
+  SESSION_LINKING_DEFERRED  (1),
+  SESSION_LINKING_INVALID   (100)  //Requested for negative testing in CR_TR00019832.
+}
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: QoS-Rule-Base-Name (1074) 3GPP (10415)
+// 5a.3.7
+type AVP_UTF8String QoS_Rule_Base_Name;
+
+
+// Sd specific AVPs
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: ADC-Rule-Install (1092) 3GPP (10415)
+// 5b.3.1
+type AVP_Grouped ADC_Rule_Install;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: ADC-Rule-Remove (1093) 3GPP (10415)
+// 5b.3.2
+type AVP_Grouped ADC_Rule_Remove;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: ADC-Rule-Definition (1094) 3GPP (10415)
+// 5b.3.3
+type AVP_Grouped ADC_Rule_Definition;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: ADC-Rule-Base-Name (1095) 3GPP (10415)
+// 5b.3.4
+type AVP_UTF8String ADC_Rule_Base_Name;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: ADC-Rule-Name (1096) 3GPP (10415)
+// 5b.3.5
+type AVP_OctetString ADC_Rule_Name;
+
+
+// 3GPP TS 29.212 V15.1.0
+// AVP: ADC-Rule-Report (1097) 3GPP (10415)
+// 5b.3.6
+type AVP_Grouped ADC_Rule_Report;
+
diff --git a/src/GxaInterface_3GPP2_X_S0057_0_300.ddf b/src/GxaInterface_3GPP2_X_S0057_0_300.ddf
index 34279255e019f46d9d8a4c512ad758ca6afd7b90..b539dbc9fc7def176df801b476bdba8b1da32ac5 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/MobileIPv4_Application_IETF_RFC4004.ddf b/src/MobileIPv4_Application_IETF_RFC4004.ddf
index 0be2b4654afc001924a03a29506a4aacd2d29396..d8dcea0b760747113afbdb445042f8742adface8 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:                R40A
+//  Rev:                R55A
 //  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 d89c3f718c69c12862090219f786ed868f694aeb..71a035dec9013441cf1be3decfe2d12dec44b40c 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL113462
 ///////////////////////////////////////////////
 
diff --git a/src/MobileIPv6_HA_IETF_RFC5778.ddf b/src/MobileIPv6_HA_IETF_RFC5778.ddf
index 9f0f1dfaeb374d36ff8361c720052a9541de809d..4ca69688bb2d423fb30bb1e789cf6af49ae25630 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL113462
 ///////////////////////////////////////////////
 
diff --git a/src/MobileIPv6_NAS_IETF_RFC5447.ddf b/src/MobileIPv6_NAS_IETF_RFC5447.ddf
index c59ef9ee5e11f04ddf58ce903a7e9720c837cdfa..0c06dbc06af7b1b1dc2812e2ffab69ad1862e840 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL113462
 ///////////////////////////////////////////////
 
diff --git a/src/NGN_NetworkAccesses_ETSI_ES183020_111.ddf b/src/NGN_NetworkAccesses_ETSI_ES183020_111.ddf
index af49d363b7b9d7bc1c2e762d016d57e9244fe1cf..f8e8632cdd3ed8359a07e51439f068adc941746b 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/NetworkAccessServer_IETF_RFC4005.ddf b/src/NetworkAccessServer_IETF_RFC4005.ddf
index a4bfead723fa900fe862d33d9e53bb084dbad699..bb25ad433d7f395597c4cdca77e3818af0b0a2e8 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL113462
 ///////////////////////////////////////////////
 
diff --git a/src/RqInterface_ETSI_ES283026_241.ddf b/src/RqInterface_ETSI_ES283026_241.ddf
index 1a4055b8d9b5cb5a742e4d912963e75085896957..7d24c90ad5b4140e9876e1adde91e15b3be73f16 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:                R40A
+//  Rev:                R55A
 //  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 f420dbececa5185cad04bdbf9684346304b826bc..91c4506632fc26791e81f0eddf56936294e16908 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/RxInterface_PCC_3GPP_TS29214_8a0.ddf b/src/RxInterface_PCC_3GPP_TS29214_8a0.ddf
index b798cd46f3a0a9d1b86f61f73afed76bad460bf4..1c240a9c981218205af78027d982c13b7260b9a3 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/RxInterface_PCC_3GPP_TS29214_990.ddf b/src/RxInterface_PCC_3GPP_TS29214_990.ddf
index 872d062cdd33f2f74768f2577963c7de367c38f0..a9408282365ca5a206098f03a7c4be760706bde6 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/RxInterface_PCC_3GPP_TS29214_a70.ddf b/src/RxInterface_PCC_3GPP_TS29214_a70.ddf
index b2391647c307efc47f69d06de813049850522cd3..fc798ea66e4b30ace789097f5ede33d9667f70e3 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/RxInterface_PCC_3GPP_TS29214_c10.ddf b/src/RxInterface_PCC_3GPP_TS29214_c10.ddf
index 752267a9a8a74e2f6e6cefe80dec4b0f2a2da19f..c99108bacc777b53304ea3c3fc4ea71b62e14f68 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/RxInterface_PCC_3GPP_TS29214_d10.ddf b/src/RxInterface_PCC_3GPP_TS29214_d10.ddf
index d7bffcaf2286a13f82499121bf39e876c1db93d8..801b3b9965d57b1cfa6b554e07e5a4354dcacc17 100644
--- a/src/RxInterface_PCC_3GPP_TS29214_d10.ddf
+++ b/src/RxInterface_PCC_3GPP_TS29214_d10.ddf
@@ -11,7 +11,7 @@
 //
 //  File:               RxInterface_PCC_3GPP_TS29214_d10.ddf
 //  Description:        DDF for Rx according to 3GPP TS 29.214 d.1.0
-//  Rev:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/RxInterface_PCC_3GPP_TS29214_f20.ddf b/src/RxInterface_PCC_3GPP_TS29214_f20.ddf
new file mode 100644
index 0000000000000000000000000000000000000000..f8c6c6747aabeec5ef319dee8e9776912a38a17c
--- /dev/null
+++ b/src/RxInterface_PCC_3GPP_TS29214_f20.ddf
@@ -0,0 +1,437 @@
+/******************************************************************************
+* Copyright (c) 2004, 2018  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_f20.ddf
+//  Description:        DDF for Rx according to 3GPP TS 29.214 15.2.0
+//  Rev:                R55A
+//  Prodnr:             CNL 113 462
+///////////////////////////////////////////////
+
+
+// APPLICATION-NAME: RX
+// APPLICATION-REVISION: VF_2_0
+
+// AVP implementations according to: 
+// 3GPP TS 29.214 15.2.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 15.2.0 5.6
+type enumerated Command_Code
+{
+  Authorize_Authenticate (265),
+  Re_Auth                (258),
+  Session_Termination    (275),
+  Abort_Session          (274)
+}
+
+
+
+// 3GPP TS 29.214 15.2.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 15.2.0
+// AVP: Access-Network-Charging-Address (501) 3GPP (10415)
+// 5.3.2
+type AVP_Address Access_Network_Charging_Address;
+
+
+// 3GPP TS 29.214 15.2.0
+// AVP: Access-Network-Charging-Identifier (502) 3GPP (10415)
+// 5.3.3
+type AVP_Grouped Access_Network_Charging_Identifier;
+
+
+// 3GPP TS 29.214 15.2.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 15.2.0
+// AVP: AF-Application-Identifier (504) 3GPP (10415)
+// 5.3.5
+type AVP_OctetString AF_Application_Identifier;
+
+
+// 3GPP TS 29.214 15.2.0
+// AVP: AF-Charging-Identifier (505) 3GPP (10415)
+// 5.3.6
+type AVP_OctetString AF_Charging_Identifier;
+
+
+// 3GPP TS 29.214 15.2.0
+// AVP: Codec-Data  (524) 3GPP (10415)
+// 5.3.7
+type AVP_OctetString Codec_Data;
+
+
+// 3GPP TS 29.214 15.2.0
+// AVP: Flow-Description (507) 3GPP (10415)
+// 5.3.8
+type AVP_IPFilterRule Flow_Description;
+
+
+// 3GPP TS 29.214 15.2.0
+// AVP: Flow-Number (509) 3GPP (10415)
+// 5.3.9
+type AVP_Unsigned32 Flow_Number;
+
+
+// 3GPP TS 29.214 15.2.0
+// AVP: Flows (510) 3GPP (10415)
+// 5.3.10
+type AVP_Grouped Flows;
+
+
+// 3GPP TS 29.214 15.2.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 15.2.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 15.2.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),
+  INDICATION_OF_TRANSFER_POLICY_EXPIRED (15),
+  PLMN_CHANGE                          (16)
+}
+
+
+// 3GPP TS 29.214 15.2.0
+// AVP: Max-Requested-Bandwidth-DL (515) 3GPP (10415)
+// 5.3.14
+type AVP_Unsigned32 Max_Requested_Bandwidth_DL;
+
+
+// 3GPP TS 29.214 15.2.0
+// AVP: Max-Requested-Bandwidth-UL (516) 3GPP (10415)
+// 5.3.15
+type AVP_Unsigned32 Max_Requested_Bandwidth_UL;
+
+
+// 3GPP TS 29.214 15.2.0
+// AVP: Media-Component-Description (517) 3GPP (10415)
+// 5.3.16
+type AVP_Grouped Media_Component_Description;
+
+
+// 3GPP TS 29.214 15.2.0
+// AVP: Media-Component-Number (518) 3GPP (10415)
+// 5.3.17
+type AVP_Unsigned32 Media_Component_Number;
+
+
+// 3GPP TS 29.214 15.2.0
+// AVP: Media-Sub-Component (519) 3GPP (10415)
+// 5.3.18
+type AVP_Grouped Media_Sub_Component;
+
+
+// 3GPP TS 29.214 15.2.0
+// AVP: Media-Type (520) 3GPP (10415)
+// 5.3.19
+type AVP_Unsigned32 Media_Type;
+
+
+// 3GPP TS 29.214 15.2.0
+// AVP: RR-Bandwidth (521) 3GPP (10415)
+// 5.3.20
+type AVP_Unsigned32 RR_Bandwidth;
+
+
+// 3GPP TS 29.214 15.2.0
+// AVP: RS-Bandwidth (522) 3GPP (10415)
+// 5.3.21
+type AVP_Unsigned32 RS_Bandwidth;
+
+// 3GPP TS 29.214 15.2.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 15.2.0
+// AVP:  Service-URN (525) 3GPP (10415)
+// 5.3.23
+type AVP_OctetString Service_URN;
+
+
+// 3GPP TS 29.214 15.2.0
+// AVP: Acceptable-Service-Info (526) 3GPP (10415)
+// 5.3.24
+type AVP_Grouped Acceptable_Service_Info;
+
+// 3GPP TS 29.214 15.2.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 15.2.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 15.2.0
+// AVP: Sponsored-Connectivity-Data (530) 3GPP (10415)
+// 5.3.27
+type AVP_Grouped Sponsored_Connectivity_Data;
+
+// 3GPP TS 29.214 15.2.0
+// AVP: Sponsor-Identity (531) 3GPP (10415)
+// 5.3.28
+type AVP_UTF8String Sponsor_Identity;
+
+// 3GPP TS 29.214 15.2.0
+// AVP: Application-Service-Provider-Identity (532) 3GPP (10415)
+// 5.3.29
+type AVP_UTF8String Application_Service_Provider_Identity;
+
+
+// 3GPP TS 29.214 15.2.0
+// AVP: MPS-Identifier (528) 3GPP (10415)
+// 5.3.30
+type AVP_OctetString MPS_Identifier;
+
+// 3GPP TS 29.214 15.2.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 15.2.0
+// AVP: Min-Requested-Bandwidth-DL (534) 3GPP (10415)
+// 5.3.32
+type AVP_Unsigned32 Min_Requested_Bandwidth_DL;
+
+// 3GPP TS 29.214 15.2.0
+// AVP: Min-Requested-Bandwidth-UL (535) 3GPP (10415)
+// 5.3.33
+type AVP_Unsigned32 Min_Requested_Bandwidth_UL;
+
+// 3GPP TS 29.214 15.2.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 15.2.0
+// AVP: Ip-Domain-Id (537) 3GPP (10415)
+// 5.3.35
+type AVP_OctetString Ip_Domain_Id;
+
+// 3GPP TS 29.214 15.2.0
+// AVP: GCS-Identifier (538) 3GPP (10415)
+// 5.3.36
+type AVP_OctetString GCS_Identifier;
+
+// 3GPP TS 29.214 15.2.0
+// AVP: Sharing-Key-DL (539) 3GPP (10415)
+// 5.3.37
+type AVP_Unsigned32 Sharing_Key_DL;
+
+// 3GPP TS 29.214 15.2.0
+// AVP: Sharing-Key-UL  (540) 3GPP (10415)
+// 5.3.38
+type AVP_Unsigned32 Sharing_Key_UL;
+
+// 3GPP TS 29.214 15.2.0
+// AVP: Retry-Interval (541) 3GPP (10415)
+// 5.3.39
+type AVP_Unsigned32 Retry_Interval;
+
+// 3GPP TS 29.214 15.2.0
+// AVP: Sponsoring-Action (542) 3GPP (10415)
+// 5.3.40
+type enumerated Sponsoring_Action 
+{
+  DISABLE_SPONSORING (0),	
+  ENABLE_SPONSORING  (1)
+}
+
+// 3GPP TS 29.214 15.2.0
+// AVP: Max-Supported-Bandwidth-DL (543) 3GPP (10415)
+// 5.3.41
+type AVP_Unsigned32 Max_Supported_Bandwidth_DL;
+
+// 3GPP TS 29.214 15.2.0
+// AVP: Max-Supported-Bandwidth-UL (544) 3GPP (10415)
+// 5.3.42
+type AVP_Unsigned32 Max_Supported_Bandwidth_UL;
+
+// 3GPP TS 29.214 15.2.0
+// AVP: Min-Desired-Bandwidth-DL (545) 3GPP (10415)
+// 5.3.43
+type AVP_Unsigned32 Min_Desired_Bandwidth_DL;
+
+// 3GPP TS 29.214 15.2.0
+// AVP: Min-Desired-Bandwidth-UL (546) 3GPP (10415)
+// 5.3.44
+type AVP_Unsigned32 Min_Desired_Bandwidth_UL;
+
+// 3GPP TS 29.214 15.2.0
+// AVP: MCPTT-Identifier (547) 3GPP (10415)
+// 5.3.45
+type AVP_OctetString MCPTT_Identifier;
+
+// 3GPP TS 29.214 15.2.0
+// AVP: Service-Authorization-Info (548) 3GPP (10415)
+// 5.3.46
+type AVP_Unsigned32 Service_Authorization_Info;
+
+// 3GPP TS 29.214 15.2.0
+// AVP: Priority-Sharing-Indicator (550) 3GPP (10415)
+// 5.3.47
+type enumerated Priority_Sharing_Indicator 
+{
+   PRIORITY_SHARING_ENABLED  (0),	
+   PRIORITY_SHARING_DISABLED (1)
+}
+
+// 3GPP TS 29.214 15.2.0
+// AVP: Media-Component-Status (549) 3GPP (10415)
+// 5.3.49
+type AVP_Unsigned32 Media_Component_Status;
+
+// 3GPP TS 29.214 15.2.0
+// AVP: Content-Version (552) 3GPP (10415)
+// 5.3.49
+type AVP_Unsigned64 Content_Version;
+
+// 3GPP TS 29.214 15.2.0
+// AVP: AF-Requested-Data (551) 3GPP (10415)
+// 5.3.50
+type AVP_Unsigned32 AF_Requested_Data;
+
+// 3GPP TS 29.214 15.2.0
+// AVP: Pre-emption-Control-Info (553) 3GPP (10415)
+// 5.3.51
+type AVP_Unsigned32 Pre_emption_Control_Info;
+
+// 3GPP TS 29.214 15.2.0
+// AVP: Extended-Max-Requested-BW-DL (554) 3GPP (10415)
+// 5.3.52
+type AVP_Unsigned32 Extended_Max_Requested_BW_DL;
+
+// 3GPP TS 29.214 15.2.0
+// AVP: Extended-Max-Requested-BW-UL (555) 3GPP (10415)
+// 5.3.53
+type AVP_Unsigned32 Extended_Max_Requested_BW_UL;
+
+// 3GPP TS 29.214 15.2.0
+// AVP: Extended-Max-Supported-BW-DL (556) 3GPP (10415)
+// 5.3.54
+type AVP_Unsigned32 Extended_Max_Supported_BW_DL;
+
+// 3GPP TS 29.214 15.2.0
+// AVP: Extended-Max-Supported-BW-UL (557) 3GPP (10415)
+// 5.3.55
+type AVP_Unsigned32 Extended_Max_Supported_BW_UL;
+
+// 3GPP TS 29.214 15.2.0
+// AVP: Extended-Min-Desired-BW-DL (558) 3GPP (10415)
+// 5.3.56
+type AVP_Unsigned32 Extended_Min_Desired_BW_DL;
+
+// 3GPP TS 29.214 15.2.0
+// AVP: Extended-Min-Desired-BW-UL (559) 3GPP (10415)
+// 5.3.57
+type AVP_Unsigned32 Extended_Min_Desired_BW_UL;
+
+// 3GPP TS 29.214 15.2.0
+// AVP: Extended-Min-Requested-BW-DL (560) 3GPP (10415)
+// 5.3.58
+type AVP_Unsigned32 Extended_Min_Requested_BW_DL;
+
+// 3GPP TS 29.214 15.2.0
+// AVP: Extended-Min-Requested-BW-UL (561) 3GPP (10415)
+// 5.3.59
+type AVP_Unsigned32 Extended_Min_Requested_BW_UL;
+
+
diff --git a/src/S6Interfaces_3GPP_TS29336_f00.ddf b/src/S6Interfaces_3GPP_TS29336_f00.ddf
new file mode 100644
index 0000000000000000000000000000000000000000..dc70e49ec15fbc81eb22df3769b8ab50665be321
--- /dev/null
+++ b/src/S6Interfaces_3GPP_TS29336_f00.ddf
@@ -0,0 +1,324 @@
+/******************************************************************************
+* Copyright (c) 2004, 2017  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:               S6Interfaces_3GPP_TS29336_f00.ddf
+//  Description:        DDF for S6m, S6n and S6t Interfaces according to 3GPP TS 29.336 V15.0.0
+//  Rev:                R55A
+//  Prodnr:             CNL 113 462
+
+
+// APPLICATION-NAME: S6
+// APPLICATION-REVISION: V15_0_0
+
+// AVP implementations according to: 
+// 3GPP TS 29.336 V15.0.0 - Home Subscriber Server (HSS) diameter interfaces for interworking with packet data networks and applications
+
+// 8.2.2
+type enumerated Command_Code 
+{
+  Subscriber_Information    (8388641),
+  Configuration_Information (8388718),
+  Reporting_Information     (8388719),
+  NIDD_Information          (8388726)
+}
+
+//S6m/S6n specific Diameter AVPs
+
+// 6.4.14
+// AVP: IP-SM-GW-Number (3100) 3GPP (10415)
+type AVP_OctetString IP_SM_GW_Number;
+
+// 6.4.15
+// AVP: IP-SM-GW-Name (3101) 3GPP (10415)
+type AVP_DiameterIdentity IP_SM_GW_Name;
+
+// 6.4.2
+// AVP: User-Identifier (3102) 3GPP (10415)
+type AVP_Grouped User_Identifier;
+
+// 6.4.3
+// AVP: Service-ID (3103) 3GPP (10415)
+type enumerated Service_ID
+{
+  DEVICE_TRIGGER (0),
+  SMS_MO (1)
+}
+
+// 6.4.4
+// AVP: SCS-Identity (3104) 3GPP (10415)
+type AVP_OctetString SCS_Identity;
+
+// 6.4.5
+// AVP: Service-Parameters (3105) 3GPP (10415)
+type AVP_Grouped Service_Parameters;
+
+// 6.4.6
+// AVP: T4-Parameters (3106) 3GPP (10415)
+type AVP_Grouped T4_Parameters;
+
+// 6.4.7
+// AVP: Service-Data (3107) 3GPP (10415)
+type AVP_Grouped Service_Data;
+
+// 6.4.8
+// AVP: T4-Data (3108) 3GPP (10415)
+type AVP_Grouped T4_Data;
+
+// 6.4.9
+// AVP: HSS-Cause (3109) 3GPP (10415)
+type AVP_Unsigned32 HSS_Cause;
+
+// 6.4.10
+// AVP: SIR-Flags (3110) 3GPP (10415)
+type AVP_Unsigned32 SIR_Flags;
+
+// 6.4.11
+// AVP: External-Identifier (3111) 3GPP (10415)
+type AVP_UTF8String External_Identifier;
+
+// 6.4.18
+// AVP: IP-SM-GW-Realm (3112) 3GPP (10415)
+type AVP_DiameterIdentity IP_SM_GW_Realm;
+
+
+
+//S6t specific Diameter AVPs
+
+// 8.4.25
+// AVP: AESE-Communication-Pattern (3113) 3GPP (10415)
+type AVP_Grouped AESE_Communication_Pattern;
+
+// 8.4.26
+// AVP: Communication-Pattern-Set (3114) 3GPP (10415)
+type AVP_Grouped Communication_Pattern_Set;
+
+// 8.4.27
+// AVP: Periodic-Communication-Indicator (3115) 3GPP (10415)
+type AVP_Unsigned32 Periodic_Communication_Indicator;
+
+// 8.4.28
+// AVP: Communication-Duration-Time (3116) 3GPP (10415)
+type AVP_Unsigned32 Communication_Duration_Time;
+
+// 8.4.29
+// AVP: Periodic-Time (3117) 3GPP (10415)
+type AVP_Unsigned32 Periodic_Time;
+
+// 8.4.30
+// AVP: Scheduled-Communication-Time (3118) 3GPP (10415)
+type AVP_Grouped Scheduled_Communication_Time;
+
+// 8.4.31
+// AVP: Stationary-Indication (3119) 3GPP (10415)
+type AVP_Unsigned32 Stationary_Indication;
+
+// 8.4.32
+// AVP: AESE-Communication-Pattern-Config-Status (3120) 3GPP (10415)
+type AVP_Grouped AESE_Communication_Pattern_Config_Status;
+
+// 8.4.33
+// AVP: AESE-Error-Report (3121) 3GPP (10415)
+type AVP_Grouped AESE_Error_Report;
+
+// 8.4.2
+// AVP: Monitoring-Event-Configuration (3122) 3GPP (10415)
+type AVP_Grouped Monitoring_Event_Configuration;
+
+// 8.4.3
+// AVP: Monitoring-Event-Report (3123) 3GPP (10415)
+type AVP_Grouped Monitoring_Event_Report;
+
+// 8.4.4
+// AVP: SCEF-Reference-ID (3124) 3GPP (10415)
+type AVP_Unsigned32 SCEF_Reference_ID;
+
+// 8.4.5
+// AVP: SCEF-ID (3125) 3GPP (10415)
+type AVP_DiameterIdentity SCEF_ID;
+
+// 8.4.6
+// AVP: SCEF-Reference-ID-for-Deletion (3126) 3GPP (10415)
+type AVP_Unsigned32 SCEF_Reference_ID_for_Deletion;
+
+// 8.4.7
+// AVP: Monitoring-Type (3127) 3GPP (10415)
+type AVP_Unsigned32 Monitoring_Type;
+
+// 8.4.8
+// AVP: Maximum-Number-of-Reports (3128) 3GPP (10415)
+type AVP_Unsigned32 Maximum_Number_of_Reports;
+
+// 8.4.9
+// AVP: UE-Reachability-Configuration (3129) 3GPP (10415)
+type AVP_Grouped UE_Reachability_Configuration;
+
+// 8.4.10
+// AVP: Monitoring-Duration (3130) 3GPP (10415)
+type AVP_Time Monitoring_Duration;
+
+// 8.4.11
+// AVP: Maximum-Detection-Time (3131) 3GPP (10415)
+type AVP_Unsigned32 Maximum_Detection_Time;
+
+// 8.4.12
+// AVP: Reachability-Type (3132) 3GPP (10415)
+type AVP_Unsigned32 Reachability_Type;
+
+// 8.4.13
+// AVP: Maximum-Latency (3133) 3GPP (10415)
+type AVP_Unsigned32 Maximum_Latency;
+
+// 8.4.14
+// AVP: Maximum-Response-Time (3134) 3GPP (10415)
+type AVP_Unsigned32 Maximum_Response_Time;
+
+// 8.4.15
+// AVP: Location-Information-Configuration (3135) 3GPP (10415)
+type AVP_Grouped Location_Information_Configuration;
+
+// 8.4.16
+// AVP: MONTE-Location-Type (3136) 3GPP (10415)
+type AVP_Unsigned32 MONTE_Location_Type;
+
+// 8.4.17
+// AVP: Accuracy (3137) 3GPP (10415)
+type AVP_Unsigned32 Accuracy;
+
+// 8.4.18
+// AVP: Association-Type (3138) 3GPP (10415)
+type AVP_Unsigned32 Association_Type;
+
+// 8.4.19
+// AVP: Roaming-Information (3139) 3GPP (10415)
+type AVP_Unsigned32 Roaming_Information;
+
+// 8.4.20
+// AVP: Reachability-Information (3140) 3GPP (10415)
+type AVP_Unsigned32 Reachability_Information;
+
+// 8.4.22
+// AVP: IMEI-Change (3141) 3GPP (10415)
+type AVP_Unsigned32 IMEI_Change;
+
+// 8.4.24
+// AVP: Monitoring-Event-Config-Status (3142) 3GPP (10415)
+type AVP_Grouped Monitoring_Event_Config_Status;
+
+// 8.4.40
+// AVP: Supported-Services (3143) 3GPP (10415)
+type AVP_Grouped Supported_Services;
+
+// 8.4.41
+// AVP: Supported-Monitoring-Events (3144) 3GPP (10415)
+type AVP_Unsigned64 Supported_Monitoring_Events;
+
+// 8.4.39
+// AVP: CIR-Flags (3145) 3GPP (10415)
+type AVP_Unsigned32 CIR_Flags;
+
+// 8.4.37
+// AVP: Service-Result (3146) 3GPP (10415)
+type AVP_Grouped Service_Result;
+
+// 8.4.38
+// AVP: Service-Result-Code (3147) 3GPP (10415)
+type AVP_Unsigned32 Service_Result_Code;
+
+// 8.4.42
+// AVP: Reference-ID-Validity-Time (3148) 3GPP (10415)
+type AVP_Time Reference_ID_Validity_Time;
+
+// 8.4.43
+// AVP: Event-Handling (3149) 3GPP (10415)
+type AVP_Unsigned32 Event_Handling;
+
+// 8.4.44
+// AVP: NIDD-Authorization-Request (3150) 3GPP (10415)
+type AVP_Grouped NIDD_Authorization_Request;
+
+// 8.4.45
+// AVP: NIDD-Authorization-Response (3151) 3GPP (10415)
+type AVP_Grouped NIDD_Authorization_Response;
+
+// 8.4.47
+// AVP: Service-Report (3152) 3GPP (10415)
+type AVP_Grouped Service_Report;
+
+// 8.4.48
+// AVP: Node-Type (3153) 3GPP (10415)
+type AVP_Unsigned32 Node_Type;
+
+// 8.4.50
+// AVP: S6t-HSS-Cause (3154) 3GPP (10415)
+type AVP_Unsigned32 S6t_HSS_Cause;
+
+// 8.4.51
+// AVP: Enhanced-Coverage-Restriction (3155) 3GPP (10415)
+type AVP_Grouped Enhanced_Coverage_Restriction;
+
+// 8.4.52
+// AVP: Enhanced-Coverage-Restriction-Data (3156) 3GPP (10415)
+type AVP_Grouped Enhanced_Coverage_Restriction_Data;
+
+// 8.4.53
+// AVP: Restricted-PLMN-List (3157) 3GPP (10415)
+type AVP_Grouped Restricted_PLMN_List;
+
+// 8.4.54
+// AVP: Allowed-PLMN-List (3158) 3GPP (10415)
+type AVP_Grouped Allowed_PLMN_List;
+
+// 8.4.55
+// AVP: Requested-Validity-Time (3159) 3GPP (10415)
+type AVP_Time Requested_Validity_Time;
+
+// 8.4.56
+// AVP: Granted-Validity-Time (3160) 3GPP (10415)
+type AVP_Time Granted_Validity_Time;
+
+// 8.4.57
+// AVP: NIDD-Authorization-Update (3161) 3GPP (10415)
+type AVP_Grouped NIDD_Authorization_Update;
+
+// 8.4.58
+// AVP: Loss-Of-Connectivity-Reason (3162) 3GPP (10415)
+type AVP_Unsigned32 Loss_Of_Connectivity_Reason;
+
+// 8.4.59
+// AVP: Group-Reporting-Guard-Timer (3163) 3GPP (10415)
+type AVP_Unsigned32 Group_Reporting_Guard_Timer;
+
+// 8.4.60
+// AVP: CIA-Flags (3164) 3GPP (10415)
+type AVP_Unsigned32 CIA_Flags;
+
+// 8.4.61
+// AVP: Group-Monitoring-Event-Report (3165) 3GPP (10415)
+type AVP_Grouped Group_Monitoring_Event_Report;
+
+// 8.4.62
+// AVP: Group-Monitoring-Event-Report-Item (3166) 3GPP (10415)
+type AVP_Grouped Group_Monitoring_Event_Report_Item;
+
+// 8.4.63
+// AVP: RIR-Flags (3167) 3GPP (10415)
+type AVP_Unsigned32 RIR_Flags;
+
+// 8.4.64
+// AVP: Type-Of-External-Identifier (3168) 3GPP (10415)
+type AVP_Unsigned32 Type_Of_External_Identifier;
+
+// 8.4.65
+// AVP: APN-Validity-Time (3169) 3GPP (10415)
+type AVP_Grouped APN_Validity_Time;
+
+
+
diff --git a/src/S6cInterface_3GPP_TS29338_f00.ddf b/src/S6cInterface_3GPP_TS29338_f00.ddf
new file mode 100644
index 0000000000000000000000000000000000000000..001b300ea6dd3fa2941de2b5d809e17eec4ae1b4
--- /dev/null
+++ b/src/S6cInterface_3GPP_TS29338_f00.ddf
@@ -0,0 +1,113 @@
+/******************************************************************************
+* Copyright (c) 2004, 2017  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:               S6cInterface_3GPP_TS29338_f00.ddf
+//  Description:        DDF for S6c Interface according to 3GPP TS 29.338 V15.0.0
+//  Rev:                R55A
+//  Prodnr:             CNL 113 462
+
+
+// APPLICATION-NAME: S6C
+// APPLICATION-REVISION: V15_0_0
+
+// 5.3.2.2
+type enumerated Command_Code 
+{
+  Send_Routing_Info_for_SM (8388647),
+  Alert_Service_Centre (8388648),
+  Report_SM_Delivery_Status (8388649)
+}
+
+// 5.3.3.2
+// AVP: SM-RP-MTI (3308) 3GPP (10415)
+type enumerated SM_RP_MTI
+{
+  SM_DELIVER (0),
+  SM_STATUS_REPORT (1)
+}
+
+// 5.3.3.3
+// AVP: SM-RP-SMEA (3309) 3GPP (10415)
+type AVP_OctetString SM_RP_SMEA;
+
+// 5.3.3.4
+// AVP: SRR-Flags (3310) 3GPP (10415)
+type AVP_Unsigned32 SRR_Flags;
+
+// 5.3.3.5
+// AVP: SM-Delivery-Not-Intended (3311) 3GPP (10415)
+type enumerated SM_Delivery_Not_Intended
+{
+  ONLY_IMSI_REQUESTED (0),
+  ONLY_MCC_MNC_REQUESTED (1)
+}
+
+// 5.3.3.8
+// AVP: MWD-Status (3312) 3GPP (10415)
+type AVP_Unsigned32 MWD_Status;
+
+// 5.3.3.9
+// AVP: MME-Absent-User-Diagnostic-SM (3313) 3GPP (10415)
+type AVP_Unsigned32 MME_Absent_User_Diagnostic_SM;
+
+// 5.3.3.10
+// AVP: MSC-Absent-User-Diagnostic-SM (3314) 3GPP (10415)
+type AVP_Unsigned32 MSC_Absent_User_Diagnostic_SM;
+
+// 5.3.3.11
+// AVP: SGSN-Absent-User-Diagnostic-SM (3315) 3GPP (10415)
+type AVP_Unsigned32 SGSN_Absent_User_Diagnostic_SM;
+
+// 5.3.3.14
+// AVP: SM-Delivery-Outcome (3316) 3GPP (10415)
+type AVP_Grouped SM_Delivery_Outcome;
+
+// 5.3.3.15
+// AVP: MME-SM-Delivery-Outcome (3317) 3GPP (10415)
+type AVP_Grouped MME_SM_Delivery_Outcome;
+
+// 5.3.3.16
+// AVP: MSC-SM-Delivery-Outcome (3318) 3GPP (10415)
+type AVP_Grouped MSC_SM_Delivery_Outcome;
+
+// 5.3.3.17
+// AVP: SGSN-SM-Delivery-Outcome (3319) 3GPP (10415)
+type AVP_Grouped SGSN_SM_Delivery_Outcome;
+
+// 5.3.3.18
+// AVP: IP-SM-GW-SM-Delivery-Outcome (3320) 3GPP (10415)
+type AVP_Grouped IP_SM_GW_SM_Delivery_Outcome;
+
+// 5.3.3.19
+// AVP: SM-Delivery-Cause (3321) 3GPP (10415)
+type enumerated SM_Delivery_Cause
+{
+  UE_MEMORY_CAPACITY_EXCEEDED (0),
+  ABSENT_USER (1),
+  SUCCESSFUL_TRANSFER (2)
+}
+
+// 5.3.3.20
+// AVP: Absent-User-Diagnostic-SM (3322) 3GPP (10415)
+type AVP_Unsigned32 Absent_User_Diagnostic_SM;
+
+// 5.3.3.21
+// AVP: RDR-Flags (3323) 3GPP (10415)
+type AVP_Unsigned32 RDR_Flags;
+
+// 5.3.3.22
+// AVP: Maximum-UE-Availability-Time (3329) 3GPP (10415)
+type AVP_Time Maximum_UE_Availability_Time;
+
+// 5.3.3.23
+// AVP: SMS-GMSC-Alert-Event (3333) 3GPP (10415)
+type AVP_Unsigned32 SMS_GMSC_Alert_Event;
+
diff --git a/src/S9Interface_3GPP_TS29215_b40.ddf b/src/S9Interface_3GPP_TS29215_b40.ddf
index 3247f915a2fc5b03314c460d049a89fead1cce7a..29a95a0191a1802e356370d91da7c354d15876e4 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/SGdGddInterface_3GPP_TS29338_f00.ddf b/src/SGdGddInterface_3GPP_TS29338_f00.ddf
new file mode 100644
index 0000000000000000000000000000000000000000..761181044b67d5ba00a5b459fa56448ca0bbc5aa
--- /dev/null
+++ b/src/SGdGddInterface_3GPP_TS29338_f00.ddf
@@ -0,0 +1,99 @@
+/******************************************************************************
+* Copyright (c) 2004, 2017  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:               SGdGddInterface_3GPP_TS29338_f00.ddf
+//  Description:        DDF for SGd/Gdd Interface according to 3GPP TS 29.338 V15.0.0
+//  Rev:                R55A
+//  Prodnr:             CNL 113 462
+
+
+// APPLICATION-NAME: SGdGdd
+// APPLICATION-REVISION: V15_0_0
+
+// 5.3.2.2
+type enumerated Command_Code 
+{
+  MO_Forward_Short_Message (8388645),
+  MT_Forward_Short_Message (8388646)
+}
+
+// 5.3.3.2
+// AVP: SC-Address (3300) 3GPP (10415)
+type AVP_OctetString SC_Address;
+
+// 5.3.3.3
+// AVP: SM-RP-UI (3301) 3GPP (10415)
+type AVP_OctetString SM_RP_UI;
+
+// 5.3.3.4
+// AVP: TFR-Flags (3302) 3GPP (10415)
+type AVP_Unsigned32 TFR_Flags;
+
+// 5.3.3.5
+// AVP: SM-Delivery-Failure-Cause (3303) 3GPP (10415)
+type AVP_Grouped SM_Delivery_Failure_Cause;
+
+// 5.3.3.6
+// AVP: SM-Enumerated-Delivery-Failure-Cause (3304) 3GPP (10415)
+type enumerated SM_Enumerated_Delivery_Failure_Cause
+{
+  MEMORY_CAPACITY_EXCEEDED  (0),
+  EQUIPMENT_PROTOCOL_ERROR  (1),
+  EQUIPMENT_NOT_SM_EQUIPPED (2),
+  UNKNOWN_SERVICE_CENTRE    (3),
+  SC_CONGESTION             (4),
+  INVALID_SME_ADDRESS       (5),
+  USER_NOT_SC_USER          (6)
+}
+
+// 5.3.3.7
+// AVP: SM-Diagnostic-Info (3305) 3GPP (10415)
+type AVP_OctetString SM_Diagnostic_Info;
+
+// 5.3.3.10
+// AVP: SM-Delivery-Timer (3306) 3GPP (10415)
+type AVP_Unsigned32 SM_Delivery_Timer;
+
+// 5.3.3.11
+// AVP: SM-Delivery-Start-Time (3307) 3GPP (10415)
+type AVP_Time SM_Delivery_Start_Time;
+
+// 5.3.3.13
+// AVP: SMSMI-Correlation-ID (3324) 3GPP (10415)
+type AVP_Grouped SMSMI_Correlation_ID;
+
+// 5.3.3.14
+// AVP: HSS-ID (3325) 3GPP (10415)
+type AVP_OctetString HSS_ID;
+
+// 5.3.3.15
+// AVP: Originating-SIP-URI (3326) 3GPP (10415)
+type AVP_UTF8String Originating_SIP_URI;
+
+// 5.3.3.16
+// AVP: Destination-SIP-URI (3327) 3GPP (10415)
+type AVP_UTF8String Destination_SIP_URI;
+
+// 5.3.3.12
+// AVP: OFR-Flags (3328) 3GPP (10415)
+type AVP_Unsigned32 OFR_Flags;
+
+// 5.3.3.17
+// AVP: Maximum-Retransmission-Time (3330) 3GPP (10415)
+type AVP_Time Maximum_Retransmission_Time;
+
+// 5.3.3.18
+// AVP: Requested-Retransmission-Time (3331) 3GPP (10415)
+type AVP_Time Requested_Retransmission_Time;
+
+// 5.3.3.19
+// AVP: SMS-GMSC-Address (3332) 3GPP (10415)
+type AVP_OctetString SMS_GMSC_Address;
diff --git a/src/SGmbInterface_3GPP_TS29061_940.ddf b/src/SGmbInterface_3GPP_TS29061_940.ddf
index ed752f42cbc35c38845d5f29a796401bceb06e18..9367c2fdb153d639904e2e6a86e407916a98f418 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/SGmbInterface_3GPP_TS29061_980.ddf b/src/SGmbInterface_3GPP_TS29061_980.ddf
index 2454cc393e3e42af1bfe6ae0de3ac3e31c6f449d..29dd351e34478a2be298c03fee3d50fe1d29444f 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:                R40A
+//  Rev:                R13A04
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/SGmbInterface_3GPP_TS29061_b90.ddf b/src/SGmbInterface_3GPP_TS29061_b90.ddf
index c4059c374e569f1d288ce09bb9b7502bee7358bf..65050a8403cadb8e5029ea4a577297d5d65297de 100644
--- a/src/SGmbInterface_3GPP_TS29061_b90.ddf
+++ b/src/SGmbInterface_3GPP_TS29061_b90.ddf
@@ -11,7 +11,7 @@
 //
 //  File:               SGmbInterface_3GPP_TS29061_b90.ddf
 //  Description:        DDF for SGmb according to 3GPP TS 29.061 V11.9.0
-//  Rev:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/SGmbInterface_3GPP_TS29061_d70.ddf b/src/SGmbInterface_3GPP_TS29061_d70.ddf
new file mode 100644
index 0000000000000000000000000000000000000000..7f96a758f7ef0f24d21d446316e9edc27caa46bd
--- /dev/null
+++ b/src/SGmbInterface_3GPP_TS29061_d70.ddf
@@ -0,0 +1,91 @@
+/******************************************************************************
+* Copyright (c) 2004, 2017  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:
+*   Máté Kovács
+******************************************************************************/
+//
+//  File:               SGmbInterface_3GPP_TS29061_d70.ddf
+//  Description:        DDF for SGmb according to 3GPP TS 29.061 V13.7.0
+//  Rev:                R55A
+//  Prodnr:             CNL 113 462
+///////////////////////////////////////////////
+
+
+// APPLICATION-NAME: SGMB
+// APPLICATION-REVISION: V13_7_0
+
+// AVP implementations according to: 
+// 3GPP TS 29.061 V13.7.0 - Interworking between the Public Land Mobile Network (PLMN) supporting packet based services and Packet Data Networks (PDN)
+
+// 3GPP TS 29.061 V13.7.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 V13.7.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 V13.7.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 V13.7.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 V13.7.0
+// AVP: MBMS-GW-UDP-Port (927) 3GPP (10415)
+// 20.5a.5
+type AVP_OctetString MBMS_GW_UDP_Port;
+
+// 3GPP TS 29.061 V13.7.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 V13.7.0
+// AVP: MBMS-Data-Transfer-Start (929) 3GPP (10415)
+// 20.5a.7
+type AVP_Unsigned64 MBMS_Data_Transfer_Start;
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: MBMS-Data-Transfer-Stop (930) 3GPP (10415)
+// 20.5a.8
+type AVP_Unsigned64 MBMS_Data_Transfer_Stop;
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: MBMS-Flag (931) 3GPP (10415)
+// 20.5a.9
+type AVP_Unsigned32 MBMS_Flag;
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: Restart-Counter (932) 3GPP (10415)
+// 20.5a.10
+type AVP_Unsigned32 Restart_Counter;
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: Diagnostic-Info (933) 3GPP (10415)
+// 20.5a.11
+type AVP_Unsigned32 Diagnostic_Info;
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: MBMS-Cell-List (934) 3GPP (10415)
+// 20.5a.12
+type AVP_OctetString MBMS_Cell_List;
\ No newline at end of file
diff --git a/src/SKT_Specific_AVPs.ddf b/src/SKT_Specific_AVPs.ddf
index bb9265cebe416b80ca7269e3c60dd180f9c4e7c6..28061e9e75920aa05b8ae27a60a3cebdd245197a 100644
--- a/src/SKT_Specific_AVPs.ddf
+++ b/src/SKT_Specific_AVPs.ddf
@@ -11,7 +11,7 @@
 //
 //  File:               SKT_Specific_AVPs.ddf
 //  Description:        SKT Specific AVP definitions
-//  Rev:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 
 
@@ -25,3 +25,11 @@
 // Zone-Info 
 // AVP: Zone-Info (9104) SKT (5806)
 type AVP_UTF8String Zone_Info;
+
+// Quota-Noti
+// AVP: Quota-Noti (9105) SKT (5806)
+type AVP_UTF8String Quota_Noti;
+
+// Win-Service-Type
+// AVP: Win-Service-Type (10002) SKT (5806)
+type AVP_Unsigned32 Win_Service_Type;
diff --git a/src/SLgInterface_3GPP_TS29172_d10.ddf b/src/SLgInterface_3GPP_TS29172_d10.ddf
index aac1b1f4836fe349b1c9128cd29e36e7fb9d15ee..c9dd27271225e582ea3fb20bdd176844a2943726 100644
--- a/src/SLgInterface_3GPP_TS29172_d10.ddf
+++ b/src/SLgInterface_3GPP_TS29172_d10.ddf
@@ -11,7 +11,7 @@
 //
 //  File:               SLgInterface_3GPP_TS29172_d10.ddf
 //  Description:        DDF for SLg according to 3GPP TS 29.172 d.1.0
-//  Rev:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/SLhInterface_3GPP_TS29173_d00.ddf b/src/SLhInterface_3GPP_TS29173_d00.ddf
index 57256b8ae3ef3d554708e5a3bd31cde2d4a381d9..322ee16ea7098450f932017f69d2302601f64e7d 100644
--- a/src/SLhInterface_3GPP_TS29173_d00.ddf
+++ b/src/SLhInterface_3GPP_TS29173_d00.ddf
@@ -11,7 +11,7 @@
 //
 //  File:               SLhInterface_3GPP_TS29173_d00.ddf
 //  Description:        DDF for SLh according to 3GPP TS 29.173 d.0.0
-//  Rev:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/ShInterface_3GPP_TS29329_620.ddf b/src/ShInterface_3GPP_TS29329_620.ddf
index 1d76a9953908cf5e724a612302c0a7fc21f657cc..e49954c43adabee6f9f66d94e5eace847ef6e6ff 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/ShInterface_3GPP_TS29329_750.ddf b/src/ShInterface_3GPP_TS29329_750.ddf
index 10c10e0a1d33b65b1de43bfff3127a6e4aac4fd0..1a9c21c98a88807f336520fdd28fb5181aaf2cc2 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/ShInterface_3GPP_TS29329_820.ddf b/src/ShInterface_3GPP_TS29329_820.ddf
index c1bb8ebe44ab866c006be06f4572fa5e03550ce9..0a9adac2f6bd024c938eadc7d93caaa1a227df7c 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/ShInterface_3GPP_TS29329_a30.ddf b/src/ShInterface_3GPP_TS29329_a30.ddf
index 4ad65a9e55bd360e6b5c284402b7cafb61190d59..bc500d579db88fac2312d66f55693e5b309ebf03 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/ShInterface_3GPP_TS29329_a50.ddf b/src/ShInterface_3GPP_TS29329_a50.ddf
index 94f4419a2e186779bad7c9517084fc4f9d61b781..c7b428c9e61836885f28c49542708cd3b6edffaf 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/SyInterface_3GPP_TS29219_b30.ddf b/src/SyInterface_3GPP_TS29219_b30.ddf
index 9df4c5dd537da5c46f594032c68a9e0723067218..026aceba7dc4ebf0e52a566add6228910da8f9c1 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/T6Interfaces_3GPP_TS29128_f00.ddf b/src/T6Interfaces_3GPP_TS29128_f00.ddf
new file mode 100644
index 0000000000000000000000000000000000000000..ea8f2646a71dd9aec045c1224856217d80189fac
--- /dev/null
+++ b/src/T6Interfaces_3GPP_TS29128_f00.ddf
@@ -0,0 +1,130 @@
+/******************************************************************************
+* Copyright (c) 2004, 2017  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:               T6Interfaces_3GPP_TS29128_f00.ddf
+//  Description:        DDF for T6a and T6b Interfaces according to 3GPP TS 29.128 V15.0.0
+//  Rev:                R55A
+//  Prodnr:             CNL 113 462
+
+
+// APPLICATION-NAME: T6
+// APPLICATION-REVISION: V15_0_0
+
+// AVP implementations according to: 
+// 3GPP TS 29.128 V15.0.0 - Mobility Management Entity (MME) and Serving GPRS Support Node (SGSN) interfaces for interworking with packet data networks and applications
+
+// 8.2.2
+type enumerated Command_Code 
+{
+  Connection_Management (8388732),
+  MO_Data               (8388733),
+  MT_Data               (8388734)
+}
+
+// 6.4.4
+// AVP: Communication-Failure-Information (4300) 3GPP (10415)
+type AVP_Grouped Communication_Failure_Information;
+
+// 6.4.5
+// AVP: Cause-Type (4301) 3GPP (10415)
+type AVP_Unsigned32 Cause_Type;
+
+// 6.4.6
+// AVP: S1AP-Cause (4302) 3GPP (10415)
+type AVP_Unsigned32 S1AP_Cause;
+
+// 6.4.7
+// AVP: RANAP-Cause (4303) 3GPP (10415)
+type AVP_Unsigned32 RANAP_Cause;
+
+// 6.4.8
+// AVP: BSSGP-Cause (4309) 3GPP (10415)
+type AVP_Unsigned32 BSSGP_Cause;
+
+// 6.4.9
+// AVP: GMM-Cause (4304) 3GPP (10415)
+type AVP_Unsigned32 GMM_Cause;
+
+// 6.4.10
+// AVP: SM-Cause (4305) 3GPP (10415)
+type AVP_Unsigned32 SM_Cause;
+
+// 6.4.11
+// AVP: Number-Of-UE-Per-Location-Configuration (4306) 3GPP (10415)
+type AVP_Grouped Number_Of_UE_Per_Location_Configuration;
+
+// 6.4.12
+// AVP: Number-Of-UE-Per-Location-Report (4307) 3GPP (10415)
+type AVP_Grouped Number_Of_UE_Per_Location_Report;
+
+// 6.4.13
+// AVP: UE-Count (4308) 3GPP (10415)
+type AVP_Unsigned32 UE_Count;
+
+// 6.4.18
+// AVP: Connection-Action (4314) 3GPP (10415)
+type AVP_Unsigned32 Connection_Action;
+
+// 6.4.19
+// AVP: Non-IP-Data (4315) 3GPP (10415)
+type AVP_OctetString Non_IP_Data;
+
+// 6.4.21
+// AVP: Serving-PLMN-Rate-Control (4310) 3GPP (10415)
+type AVP_Grouped Serving_PLMN_Rate_Control;
+
+// 6.4.23
+// AVP: Uplink-Rate-Limit (4311) 3GPP (10415)
+type AVP_Unsigned32 Uplink_Rate_Limit;
+
+// 6.4.22
+// AVP: Downlink-Rate-Limit (4312) 3GPP (10415)
+type AVP_Unsigned32 Downlink_Rate_Limit;
+
+// 6.4.26
+// AVP: Extended-PCO (4313) 3GPP (10415)
+type AVP_OctetString Extended_PCO;
+
+// 6.4.24
+// AVP: SCEF-Wait-Time (4316) 3GPP (10415)
+type AVP_Time SCEF_Wait_Time;
+
+// 6.4.25
+// AVP: CMR-Flags (4317) 3GPP (10415)
+type AVP_Unsigned32 CMR_Flags;
+
+// 6.4.27
+// AVP: RRC-Cause-Counter (4318) 3GPP (10415)
+type AVP_Grouped RRC_Cause_Counter;
+
+// 6.4.28
+// AVP: Counter-Value (4319) 3GPP (10415)
+type AVP_Unsigned32 Counter_Value;
+
+// 6.4.29
+// AVP: RRC-Counter-Timestamp (4320) 3GPP (10415)
+type AVP_Time RRC_Counter_Timestamp;
+
+// 6.4.31
+// AVP: TDA-Flags (4321) 3GPP (10415)
+type AVP_Unsigned32 TDA_Flags;
+
+// 6.4.32
+// AVP: Idle-Status-Indication (4322) 3GPP (10415)
+type AVP_Grouped Idle_Status_Indication;
+
+// 6.4.33
+// AVP: Idle-Status-Timestamp (4323) 3GPP (10415)
+type AVP_Time Idle_Status_Timestamp;
+
+// 6.4.34
+// AVP: Active-Time (4324) 3GPP (10415)
+type AVP_Unsigned32 Active_Time;
diff --git a/src/TCOM_Specific_AVPs.ddf b/src/TCOM_Specific_AVPs.ddf
index 193055a4d7d74dbdfe9aba791a860ee878fc7e38..ece8125132eb781037616df2b72ebfcffae8472e 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/Verizon_Specific_AVPs.ddf b/src/Verizon_Specific_AVPs.ddf
index 5f2c1481f625db334e9f1dc13068a7d6afa2c95f..a48b7aea3ef5a7a3af68155f4dd4e2c2ed2d9d01 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
@@ -71,3 +71,11 @@ type AVP_Unsigned32 Self_Activation_Status;
 // Verizon PGW-Relocation-Indication
 // AVP: PGW-Relocation-Indication (6114) Verizon (12951)
 type AVP_Grouped PGW_Relocation_Indication;
+
+// Verizon Origination-TimeStamp
+// AVP: Origination-TimeStamp (7102) Verizon (12951)
+type AVP_Unsigned64 Origination_TimeStamp;
+
+// Verizon Max-Wait-Time
+// AVP: Max-Wait-Time (7103) Verizon (12951)
+type AVP_Unsigned32 Max_Wait_Time;
diff --git a/src/Vimpelcom_Specific.ddf b/src/Vimpelcom_Specific.ddf
index e6af6c01fa5ed575992e8ae78d8ca52146543a17..4a3e6ced1bf1f9683a90f027c833d770e6c50f22 100644
--- a/src/Vimpelcom_Specific.ddf
+++ b/src/Vimpelcom_Specific.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               Vimpelcom_Specific.ddf
 //  Description:        Vimpelcom specific AVPs
-//  Rev:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
@@ -69,4 +69,9 @@ type AVP_Unsigned32 TOA_Adapt_Status;
 // AVP: TOA-Opt-Status (667) Vimpelcom_toa (50001)
 type AVP_Unsigned32 TOA_Opt_Status;
 
+// AVP: DPI-Specific-Flow-Id (668) Vimpelcom_sadpi (50000)
+type AVP_OctetString DPI_Specific_Flow_Id;
+
+// AVP: DPI-Flow-Info (669) Vimpelcom_sadpi (50000)
+type AVP_Grouped DPI_Flow_Info;
 
diff --git a/src/Vodafone_Specific.ddf b/src/Vodafone_Specific.ddf
index 082b87b1387ce57de9f436b7cf8fd0caa7fa01e0..d717cde626c30a4ad216f7dfc9524a091a7708d5 100644
--- a/src/Vodafone_Specific.ddf
+++ b/src/Vodafone_Specific.ddf
@@ -37,7 +37,7 @@
 //
 //  File:               Vodafone_Specific.ddf
 //  Description:        Vodafone specific AVPs
-//  Rev:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/WgInterface_3GPP_TS29234_910.ddf b/src/WgInterface_3GPP_TS29234_910.ddf
index 331e2b4f4a68a655bbf23b2cf541d3e256eb666d..2e2fa17f222186eb503bda0860d0d10762ff9b60 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/a2Interface_ETSI_ES183059_1_211.ddf b/src/a2Interface_ETSI_ES183059_1_211.ddf
index aab6565e7e124ed058997124fd02ba1048347442..40ae1fb993ffbd946e35ecefabce2cb700b4d0ea 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/a4Interface_ETSI_ES183066_211.ddf b/src/a4Interface_ETSI_ES183066_211.ddf
index 23bc082483cbdbc6fb125fb0a436cad2dbf82fc4..e84666244785e53c3b9f443628e564e3f6a5e5db 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/e2Interface_ETSI_ES283035_121.ddf b/src/e2Interface_ETSI_ES283035_121.ddf
index d04752664929ef644126ab06cab54f559305b924..ec522950d82cc388b35a4a7a20815cfe8915ee1e 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////
 
diff --git a/src/e4Interface_ETSI_ES283034_220.ddf b/src/e4Interface_ETSI_ES283034_220.ddf
index c085f834591a17edf62a6fc22551572f6b94fdb9..e3e138f70c039cd20f1edd0b96815498bae57d5d 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:                R40A
+//  Rev:                R55A
 //  Prodnr:             CNL 113 462
 ///////////////////////////////////////////////