diff --git a/demo/RADIUS_Mapping_new.ttcn b/demo/RADIUS_Mapping_new.ttcn
index 55928708b48fab0e220669a84d376aaf8a5cd270..1b1380f009417c2d51be8db91998a623fc0d1aa3 100644
--- a/demo/RADIUS_Mapping_new.ttcn
+++ b/demo/RADIUS_Mapping_new.ttcn
@@ -17,7 +17,7 @@
 //
 //  File:               RADIUS_Mapping_new.ttcn
 //  Description:        Example module providing UDP Mapping for RPMG
-//  Rev:                R13A
+//  Rev:                R14A
 //  Prodnr:             CNL 113 600
 //  Remark:             This file is not a part of the product.
 //                      
diff --git a/demo/RADIUS_Mapping_orig.ttcn b/demo/RADIUS_Mapping_orig.ttcn
index d4dd077c90bf8311dc6ac88b446eb436fbedf112..bf65b98fe53731c452666e9bee58c65b24bcea17 100644
--- a/demo/RADIUS_Mapping_orig.ttcn
+++ b/demo/RADIUS_Mapping_orig.ttcn
@@ -17,7 +17,7 @@
 //
 //  File:               RADIUS_Mapping_orig.ttcn
 //  Description:        Example module providing UDP Mapping for RPMG
-//  Rev:                R13A
+//  Rev:                R14A
 //  Prodnr:             CNL 113 600
 //  Remark:             This file is not a part of the product.
 //                      
diff --git a/demo/RADIUSandEAP_Demo.prj b/demo/RADIUSandEAP_Demo.prj
old mode 100644
new mode 100755
diff --git a/demo/RADIUSandEAP_Mapping.ttcn b/demo/RADIUSandEAP_Mapping.ttcn
old mode 100644
new mode 100755
index 7199ba81983a648d6a5944eb6531c379228c9de7..e1c6aecfca55757e18be11ce2f1d7687209ead26
--- a/demo/RADIUSandEAP_Mapping.ttcn
+++ b/demo/RADIUSandEAP_Mapping.ttcn
@@ -17,7 +17,7 @@
 //
 //  File:               RADIUSandEAP_Mapping.ttcn
 //  Description:        Example module providing UDP Mapping for RPMG
-//  Rev:                R13A
+//  Rev:                R14A
 //  Prodnr:             CNL 113 600
 //  Remark:             This file is not a part of the product.
 //                      
diff --git a/demo/RadiusAndEAP_Demo.ttcn b/demo/RadiusAndEAP_Demo.ttcn
old mode 100644
new mode 100755
index 7720aff1576e96fa6f44ff1ccaa5a7560b9eb9c4..55ebb776d6a8ebac4632dfb0959100013fdff47a
--- a/demo/RadiusAndEAP_Demo.ttcn
+++ b/demo/RadiusAndEAP_Demo.ttcn
@@ -16,7 +16,7 @@
 ******************************************************************************/
 //
 //  File:               RadiusAndEAP_Demo.ttcn
-//  Rev:                R13A
+//  Rev:                R14A
 //  Prodnr:             CNL 113 600
 //  Remark:             This file is not a part of the product.       
 //                       
diff --git a/demo/Radius_Test_new.ttcn b/demo/Radius_Test_new.ttcn
index 1a23019f54cbc9a6582305f5cf4ec6c3770f5bc8..5ad2bf2010cdda99106ffaf26605b11dbfd82d7c 100644
--- a/demo/Radius_Test_new.ttcn
+++ b/demo/Radius_Test_new.ttcn
@@ -16,7 +16,7 @@
 ******************************************************************************/
 //
 //  File:               Radius_Test_new.ttcn
-//  Rev:                R13A
+//  Rev:                R14A
 //  Prodnr:             CNL 113 600
 //  Remark:             This file is not a part of the product.       
 //                       
diff --git a/demo/Radius_Test_orig.ttcn b/demo/Radius_Test_orig.ttcn
index f5303ce1363ec2f386536c08fae1ab0cc73c29a6..b6ca5f6ec135433c0676cf07dd9a8d68a326b322 100644
--- a/demo/Radius_Test_orig.ttcn
+++ b/demo/Radius_Test_orig.ttcn
@@ -16,7 +16,7 @@
 ******************************************************************************/
 //
 //  File:               Radius_Test_orig.ttcn
-//  Rev:                R13A
+//  Rev:                R14A
 //  Prodnr:             CNL 113 600
 //  Remark:             This file is not a part of the product.       
 //                       
diff --git a/demo/gui_make_RPMG_new.sh b/demo/gui_make_RPMG_new.sh
old mode 100644
new mode 100755
diff --git a/demo/gui_make_RPMG_orig.sh b/demo/gui_make_RPMG_orig.sh
old mode 100644
new mode 100755
diff --git a/demo/gui_make_RPMGandEAP.sh b/demo/gui_make_RPMGandEAP.sh
old mode 100644
new mode 100755
diff --git a/doc/RADIUS_ProtocolModule_Generator_CNL113600_PRI.doc b/doc/RADIUS_ProtocolModule_Generator_CNL113600_PRI.doc
index d9d7fdfdfce82373095170f91347cceba2062e19..d008f423de74d1d125f5803b10ba02b1eec4cf9c 100644
Binary files a/doc/RADIUS_ProtocolModule_Generator_CNL113600_PRI.doc and b/doc/RADIUS_ProtocolModule_Generator_CNL113600_PRI.doc differ
diff --git a/src/ATTR.awk b/src/ATTR.awk
old mode 100644
new mode 100755
index 70887a7e09e01d3f0ef9ab42e202c798a933670e..4b1cb8a18ee91bab9beac3a5affec1d95b39cb3c
--- a/src/ATTR.awk
+++ b/src/ATTR.awk
@@ -18,7 +18,7 @@
 #                                                                           #
 #  File:               ATTR.awk                                             #
 #  Description:	       RPMG AWK script for weaving RDF files                #
-#  Rev:                R13A
+#  Rev:                R14A
 #  Prodnr:             CNL 113 600                                          #
 #############################################################################
 
diff --git a/src/ATTR.sh b/src/ATTR.sh
old mode 100644
new mode 100755
diff --git a/src/RADIUS_EncDec.cc b/src/RADIUS_EncDec.cc
index 9d733a344b78e4cd5213f4a9c151e0c2f98c7f68..1c97f3a5545c300154a59b8c68898f01417970bc 100644
--- a/src/RADIUS_EncDec.cc
+++ b/src/RADIUS_EncDec.cc
@@ -18,7 +18,7 @@
 //
 //  File:               RADIUS_EncDec.cc
 //  Description:        Encoder/Decoder and external functions for RPMG
-//  Rev:                R13A
+//  Rev:                R14A
 //  Prodnr:             CNL 113 600
 //  Reference:          RFC 2865(RADIUS), 2866(RADIUS Accounting),        
 //                       
diff --git a/src/obsolate/RadiusAccountingAttributes.rdf b/src/obsolate/RadiusAccountingAttributes.rdf
new file mode 100644
index 0000000000000000000000000000000000000000..fdcb867cfd993a8233dd0888fd0f09676a7cd4a9
--- /dev/null
+++ b/src/obsolate/RadiusAccountingAttributes.rdf
@@ -0,0 +1,114 @@
+/******************************************************************************
+* Copyright (c) 2008, 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
+* Endre Kulcsar
+* Gabor Szalai
+* Janos Kovesdi
+* Kulcsár Endre
+* Zoltan Medve
+* Tamas Korosi
+******************************************************************************/
+
+//
+//  File:               RadiusAccountingAttributes.rdf
+//  Rev:                <RnXnn>
+//  Prodnr:             CNL 113 600
+//  Reference:          RFC 2866(RADIUS Accounting)       
+//                       
+//                      
+//
+
+
+// APPLICATION-NAME: Acc
+
+
+// Packet-Type: Accounting_Request (4) 
+
+// Packet-Type: Accounting_Response (5)
+
+
+// RFC 2866
+// Attrib: Acct-Status-Type (40)
+type enumerated Acct_Status_Type
+{
+  Start (1),
+  Stop (2),
+  Interim_Update (3),
+  Accounting_On (7),
+  Accounting_Off (8)
+}
+
+// RFC 2866
+// Attrib: Acct-Delay-Type (41)
+type Attrib_Value Acct_Delay_Type;
+
+// RFC 2866
+// Attrib: Acct-Input-Octets (42)
+type Attrib_Value Acct_Input_Octets;
+
+// RFC 2866
+// Attrib: Acct-Output-Octets (43)
+type Attrib_Value Acct_Output_Octets;
+
+// RFC 2866
+// Attrib: Acct-Session-Id (44)
+type Attrib_Text Acct_Session_Id;
+
+// RFC 2866
+// Attrib: Acct-Authentic (45)
+type enumerated Acct_Authentic
+{
+  RADIUS (1),
+  Local (2),
+  Remote (3)
+}
+
+// RFC 2866
+// Attrib: Acct-Session-Time (46)
+type Attrib_Value Acct_Session_Time;
+
+// RFC 2866
+// Attrib: Acct-Input-Packets (47)
+type Attrib_Value Acct_Input_Packets;
+
+// RFC 2866
+// Attrib: Acct-Output-Packets (48)
+type Attrib_Value Acct_Output_Packets;
+
+// RFC 2866
+// Attrib: Acct-Terminate-Cause (49)
+type enumerated Acct_Terminate_Cause
+{
+  User_Request (1),
+  Lost_Carrier (2),
+  Lost_Service (3),
+  Idle_Timeout (4),
+  Session_Timeout (5),
+  Admin_Reset (6),
+  Admin_Reboot (7),
+  Port_Error (8),
+  NAS_Error (9),
+  NAS_Request (10),
+  NAS_Reboot (11),
+  Port_Unneeded (12),
+  Port_Preempted (13),
+  Port_Suspended (14),
+  Service_Unavailable (15),
+  Callback (16),
+  User_Error (17),
+  Host_Request (18)
+}
+
+// RFC 2866
+// Attrib: Acct-Multi-Session-Id (50)
+type Attrib_String Acct_Multi_Session_Id;
+
+// RFC 2866
+// Attrib: Acct-Link-Count (51)
+type Attrib_Value Acct_Link_Count;
diff --git a/src/obsolate/RadiusAndIPv6.rdf b/src/obsolate/RadiusAndIPv6.rdf
new file mode 100644
index 0000000000000000000000000000000000000000..e246e2f656cabc3d617d65a838f7ae4466e26da8
--- /dev/null
+++ b/src/obsolate/RadiusAndIPv6.rdf
@@ -0,0 +1,63 @@
+/******************************************************************************
+* Copyright (c) 2008, 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
+* Endre Kulcsar
+* Gabor Szalai
+* Janos Kovesdi
+* Kulcsár Endre
+* Zoltan Medve
+* Tamas Korosi
+******************************************************************************/
+
+//
+//  File:               RadiusAndIPv6.rdf
+//  Rev:                <RnXnn>
+//  Prodnr:             CNL 113 600
+//  Reference:          RFC 3162(RADIUS and IPv6)       
+//                       
+//                      
+//
+
+
+// APPLICATION-NAME: IPv6
+
+// RFC 3162
+// Attrib: NAS-IPv6-Address (95)
+type OCTET16 NAS_IPv6_Address;
+
+// RFC 3162
+// Attrib: Framed-Interface-Id (96)
+type OCTET8 Framed_Interface_Id;
+
+// RFC 3162
+// Attrib: Framed-IPv6-Prefix (97)
+type record Framed_IPv6_Prefix
+{
+  OCTET1 reserved,
+  UINT8 prefix_length,
+  bitstring prefixValue,
+  bitstring prefixPadding
+} with {
+  variant (prefix_length) "LENGTHTO(prefixValue)";
+  variant (prefix_length) "UNIT(bits)";
+  variant (prefixValue) "BYTEORDER(last)";
+  variant "FIELDORDER(msb)";
+  }
+
+// RFC 3162
+// Attrib: Login-IPv6-Host (98)
+type OCTET16 Login_IPv6_Host;
+
+// RFC 3162
+// Attrib: Framed-IPv6-Route (99)
+type Attrib_Text Framed_IPv6_Route;
+
+// RFC 3162
+// Attrib: Framed-IPv6-Pool (100)
+type Attrib_String Framed_IPv6_Pool;
diff --git a/src/obsolate/RadiusAuthExtensions.rdf b/src/obsolate/RadiusAuthExtensions.rdf
new file mode 100644
index 0000000000000000000000000000000000000000..dacbc1666a0d87dc9f75bb7eebcd6beca9ece2b2
--- /dev/null
+++ b/src/obsolate/RadiusAuthExtensions.rdf
@@ -0,0 +1,63 @@
+/******************************************************************************
+* Copyright (c) 2008, 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
+* Endre Kulcsar
+* Gabor Szalai
+* Janos Kovesdi
+* Kulcsár Endre
+* Zoltan Medve
+* Tamas Korosi
+******************************************************************************/
+
+//
+//  File:               RadiusAuthExtensions.rdf
+//  Rev:                <RnXnn>
+//  Prodnr:             CNL 113 600
+//  Reference:          RFC 3576(RADIUS Authorization Extensions)       
+//                       
+//                      
+//
+
+
+// APPLICATION-NAME: AuthExt
+
+
+// Packet-Type: Disconnect-Request (40) 
+
+// Packet-Type: Disconnect-ACK (41) 
+
+// Packet-Type: Disconnect-NAK (42) 
+
+// Packet-Type: CoA-Request (43) 
+
+// Packet-Type: CoA-ACK (44) 
+
+// Packet-Type: CoA-NAK (45) 
+
+
+// RFC 3576
+// Attrib: Error-Cause (101)
+type enumerated Error_Cause
+{
+  Residual_Session_Context_Removed (201),
+  Invalid_EAP_Packet (202),
+  Unsupported_Attribute (401),
+  Missing_Attribute (402),
+  NAS_Identification_Mismatch (403),
+  Invalid_Request (404),
+  Unsupported_Service (405),
+  Unsupported_Extension (406),
+  Administratively_Prohibited (501),
+  Request_Not_Routable_Proxy (502),
+  Session_Context_Not_Found (503),
+  Session_Context_Not_Removable (504),
+  Other_Proxy_Processing_Error (505),
+  Resources_Unavailable (506),
+  Request_Initiated (507)
+}
diff --git a/src/obsolate/RadiusBaseAttributes.rdf b/src/obsolate/RadiusBaseAttributes.rdf
new file mode 100644
index 0000000000000000000000000000000000000000..0de05623080be5184d20e45b0b95dc2e56f715b1
--- /dev/null
+++ b/src/obsolate/RadiusBaseAttributes.rdf
@@ -0,0 +1,772 @@
+/******************************************************************************
+* Copyright (c) 2008, 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
+* Endre Kulcsar
+* Gabor Szalai
+* Janos Kovesdi
+* Kulcsár Endre
+* Zoltan Medve
+* Tamas Korosi
+******************************************************************************/
+
+//
+//  File:               RadiusBaseAttributes.rdf
+//  Rev:                <RnXnn>
+//  Prodnr:             CNL 113 600
+//  Reference:          RFC 2865(RADIUS)       
+//                       
+//                      
+//
+
+
+// APPLICATION-NAME: Base
+
+
+
+// Packet-Type: Access-Request (1)
+
+// Packet-Type: Access_Accept (2)
+
+// Packet-Type: Access_Reject (3)
+
+// Packet-Type: Accounting_Request (4) 
+
+// Packet-Type: Accounting_Response (5)
+
+// Packet-Type: Access_Challenge (11)
+
+// Packet-Type: Status_Server (12)
+
+// Packet-Type: Status_Client (13)
+
+// Packet-Type: Reserved (255)
+
+
+
+
+// RFC 2865
+// Attrib: User-Name (1)
+type Attrib_String User_Name;
+
+// RFC 2865
+// Attrib: User-Password (2)
+type Attrib_String User_Password;
+
+// RFC 2865
+// Attrib: CHAP-Password (3)
+type record CHAP_Password 
+{
+  UINT8 CHAP_Ident,
+  Attrib_String String length(16)
+}
+
+// RFC 2865
+// Attrib: NAS-IP-Address (4)
+type Attrib_Address NAS_IP_Address;
+
+// RFC 2865
+// Attrib: NAS-Port (5)
+type Attrib_Value NAS_Port;
+
+// RFC 2865
+// Attrib: Service-Type (6)
+type enumerated Service_Type
+{
+  Login (1),
+  Framed (2),
+  Callback_Login (3),
+  Callback_Framed (4),
+  Outbound (5),
+  Administrative (6),
+  NAS_Prompt (7),
+  Authenticate_Only (8),
+  Callback_NAS_Prompt (9),
+  Call_Check (10),
+  Callback_Administrative (11)
+}
+
+
+// RFC 2865
+// Attrib: Framed-Protocol (7)
+type enumerated Framed_Protocol
+{
+  PPP (1),
+  SLIP (2),
+  Appletalk_Remote_Access_Protocol (3),
+  Gandalf_proprietary_protocol (4),
+  Xylogics_proprietary (5),
+  Xpoint75_Syncronous (6),
+  GPRS_PDP_Context (7)  
+}
+
+
+// RFC 2865
+// Attrib: Framed-IP-Address (8)
+type Attrib_Address Framed_IP_Address;
+
+// RFC 2865
+// Attrib: Framed-IP-Netmask (9)
+type Attrib_Address Framed_IP_Netmask;
+
+// RFC 2865
+// Attrib: Framed-Routing (10)
+type enumerated Framed_Routing
+{
+  None (0),
+  Send_routing_pacets (1),
+  Listen_for_routing_pacets (2),
+  Send_and_Listen (3)
+}
+
+// RFC 2865
+// Attrib: Filter-Id (11)
+type Attrib_Text Filter_Id;
+
+// RFC 2865
+// Attrib: Framed-MTU (12)
+type Attrib_Value Framed_MTU (64..65535);
+
+// RFC 2865
+// Attrib: Framed-Compression (13)
+type enumerated Framed_Compression
+{
+  None (0),
+  VJ_TCP_IP_header_compression (1),
+  IPX_header_compression (2),
+  STAC_LZS_compression (3)
+}
+
+// RFC 2865
+// Attrib: Login-IP-Host (14)
+type Attrib_Address Login_IP_Host;
+
+// RFC 2865
+// Attrib: Login-Service (15)
+type enumerated Login_Service
+{
+  Telnet (0),
+  Rlogin (1),
+  TCP_Clear (2),
+  Port_Master (3),
+  LAT (4),
+  X25_PAD (5),
+  X25_T3POS (6),
+  TCP_Clear_Quiet (7)
+}
+
+// RFC 2865
+// Attrib: Login-TCP-Port (16)
+type Attrib_Value Login_TCP_Port (0..65535);
+
+// RFC 2865
+// Attrib: Reply-Message (18)
+type Attrib_Text Reply_Message;
+
+// RFC 2865
+// Attrib: Callback-Number (19)
+type Attrib_String Callback_Number;
+
+// RFC 2865
+// Attrib: Callback-Id (20)
+type Attrib_String Callback_Id;
+
+// RFC 2865
+// Attrib: Framed-Route (22)
+type Attrib_Text Framed_Route;
+
+// RFC 2865
+// Attrib: Framed-IPX-Network (23)
+type Attrib_Value Framed_IPX_Network;
+
+// RFC 2865
+// Attrib: State (24)
+type Attrib_String State;
+
+// RFC 2865
+// Attrib: Class (25)
+type Attrib_String Class;
+
+
+// RFC 2865
+// Attrib: Session-Timeout (27)
+type Attrib_Value Session_Timeout;
+
+// RFC 2865
+// Attrib: Idle-Timeout (28)
+type Attrib_Value Idle_Timeout;
+
+// RFC 2865
+// Attrib: Termination-Action (29)
+type enumerated Termination_Action
+{
+  Default (0),
+  RADIUS_Request (1)
+}
+
+// RFC 2865
+// Attrib: Called-Station-Id (30)
+type Attrib_String Called_Station_Id;
+
+// RFC 2865
+// Attrib: Calling-Station-Id (31)
+type Attrib_String Calling_Station_Id;
+
+// RFC 2865
+// Attrib: NAS-Identifier (32)
+type Attrib_String NAS_Identifier;
+
+// RFC 2865
+// Attrib: Proxy-State (33)
+type Attrib_String Proxy_State;
+
+// RFC 2865
+// Attrib: Login-LAT-Service (34)
+type Attrib_String Login_LAT_Service;
+
+// RFC 2865
+// Attrib: Login-LAT-Node (35)
+type Attrib_String Login_LAT_Node;
+
+// RFC 2865
+// Attrib: Login-LAT-Group (36)
+type Attrib_String Login_LAT_Group;
+
+// RFC 2865
+// Attrib: Framed-AppleTalk-Link (37)
+type Attrib_Value Framed_AppleTalk_Link (0..65535);
+
+// RFC 2865
+// Attrib: Framed-AppleTalk-Network (38)
+type Attrib_Value Framed_AppleTalk_Network (0..65535);
+
+// RFC 2865
+// Attrib: Framed-AppleTalk-Zone (39)
+type Attrib_String Framed_AppleTalk_Zone;
+
+// RFC 2865
+// Attrib: CHAP-Challenge (60)
+type Attrib_String CHAP_Challenge;
+
+// RFC 2865
+// Attrib: NAS-Port-Type (61)
+type enumerated NAS_Port_Type
+{
+  Async (0),
+  Sync (1),
+  ISDN_Sync (2),
+  ISDN_Async_v120 (3),
+  ISDN_Async_v110 (4),
+  Virtual (5),
+  PIAFS (6),
+  HDLC_Clear_Channel (7),
+  X25 (8),
+  X75 (9),
+  G3_Fax (10),
+  SDSL_Symmetric_DSL (11),
+  ADSL_CAP_Asymmetric_DSL (12),
+  ADSL_DMT_Asymmetric_DSL (13),
+  ISDL_ISDN_Digital_Subscriber_Line (14),
+  Ethernet (15),
+  xDSL (16),
+  Cable (17),
+  Wireless_Other (18),
+  Wireless_IEEE_80211 (19)
+}
+
+
+// RFC 2865
+// Attrib: Port-Limit (62)
+type Attrib_Value Port_Limit;
+
+// RFC 2865
+// Attrib: Login-LAT-Port (63)
+type Attrib_String Login_LAT_Port;
+
+
+
+// RFC 2865
+// Attrib: Vendor-Specific (26)
+type record Vendor_Specific 
+{
+  vendor_id_enum     vendor_id,
+  string_val_spec    attrib_value
+} with {
+  variant (attrib_value) "CROSSTAG(f_scap_subattr_list, vendor_id=scap;
+  f_acc_subattr_list,  vendor_id=acc;
+  f_cisco_subattr_list, vendor_id=cisco;
+  f_ericsson_subattr_list, vendor_id=ericsson;
+  f_microsoft_subattr_list, vendor_id=microsoft;
+  f_adslforum_subattr_list, vendor_id=adslforum;
+  f_cdma2000_subattr_list, vendor_id=cdma2000 ;
+  f_servicefactory_subattr_list, vendor_id=servicefactory;
+  f_threegpp_subattr_list, vendor_id=threegpp;
+  f_wispr_subattr_list, vendor_id=wispr)"
+  }
+
+
+type enum_32 vendor_id_enum
+{
+  acc                (5),
+  cisco              (9),
+  ericsson         (193),
+  microsoft        (311),
+  adslforum       (3561),
+  cdma2000        (5535),
+  servicefactory  (5556),
+  threegpp       (10415),
+  scap           (10923),
+  wispr          (14122)
+} 
+
+
+type enum_8 acc_type_enum
+{
+  acc_error_message           (1),
+  acc_ccp_option              (2),
+  acc_customer_id             (6),
+  acc_tunnel_secret          (14),
+  acc_service_profile        (17),
+  acc_request_type           (18),
+  acc_dns_server_pri         (23),
+  acc_dns_server_sec         (24),
+  acc_nbns_server_pri        (25),
+  acc_nbns_server_sec        (26),
+  acc_dial_port_index        (27),
+  acc_mn_ha_shared_secret    (73),
+  acc_mip_spi                (74)
+} 
+
+
+type enum_8 cisco_type_enum
+{
+  cisco_access_control_list    (1),
+  cisco_nas_port               (2),
+  cisco_info_service         (250),
+  cisco_service_list         (251),
+  cisco_n_service_info       (252),
+  cisco_byte_count           (253)
+} 
+
+
+type enum_8 ericsson_type_enum
+{
+  product_profile                  (1),
+  digest_response                 (14),
+  digest_attributes               (15),
+  pmk                             (17),
+  layer_identity                  (34),
+  major_protocol_version          (35),
+  minor_protocol_version          (36),
+  ipt_timestamp                  (126),
+  master_session_id              (200),
+  message_from_sn                (202),
+  requested_url                  (203),
+  authorization_result_code      (204),
+  cds_uid                        (205),
+  msisdn                         (206),
+  authentication_type            (207),
+  timestamp_created              (208),
+  timestamp_used                 (209),
+  access_type                    (210),
+  requested_service_id           (211),
+  user_alias                     (212),
+  service_session_id             (213)
+} 
+
+
+type enum_8 cdma2000_type_enum
+{
+  ike_pre_shared_secret_request    (1),
+  security_level                   (2),
+  pre_shared_secret                (3),
+  reverse_tunnel_specification     (4),
+  differentiated_services_class    (5),
+  container                        (6),
+  home_agent                       (7),
+  key_id                           (8),
+  pcf_ip_addr                      (9),
+  bs_msc_addr                     (10),
+  userid                          (11),
+  forward_mux                     (12),
+  reverse_mux                     (13),
+  forward_fundamental_rate        (14),
+  reverse_fundamental_rate        (15),
+  service_option                  (16),
+  forward_traffic_type            (17),
+  reverse_traffic_type            (18),
+  fundamental_frame_size          (19),
+  forward_fundamental_rc          (20),
+  reverse_fundamental_rc          (21),
+  ip_technology                   (22),
+  compulsory_tunnel_indicator     (23),
+  release_indicator               (24),
+  bad_frame_count                 (25),
+  num_active                      (30),
+  sdb_input_octects               (31),
+  sdb_output_octects              (32),
+  numsdb_input                    (33),
+  numsdb_output                   (34),
+  ip_QoS                          (36),
+  air_QoS                         (39),
+  airlink_record_type             (40),
+  rp_session_id                   (41),
+  airlink_secuence_number         (42),
+  num_bytes_received_total        (43),
+
+  correlation_id                  (44),
+  mo_mt_indicator                 (45),
+  mobile_ip_sig_inbound_count     (46),
+  mobile_ip_sig_outbound_count    (47),
+  session_cont                    (48),
+  active_time                     (49),
+  dcch_frame_format               (50),
+  ESN                             (52),
+  s_key                           (54),
+  s_request                       (55),
+  s_lifetime                      (56),
+  mn_ha_shared_secret_request     (57),
+  mn_ha_shared_secret             (58),
+  remote_ipv4_address             (59),
+  hrpd_access_authentication      (60),
+
+  remote_ipv6_address             (70),
+  remote_address_table_index      (71),
+  remote_address_octet_count      (72),
+  always_on                       (78),
+  last_user_activity_time         (80),
+
+  session_termination_capability  (88),
+  prepaid_accounting_quota        (90),
+  prepaid_accounting_capability   (91),
+  mip_rrq_lifetime                (92),
+  service_reference_id            (94),
+  disconnect_reason               (96),
+  cdma2000_error_cause           (255) // WARNING: temporary type number, not yet standardized 2003-06-17 tmptso
+} 
+
+
+type enum_8 threegpp_type_enum
+{
+  threegpp_imsi                           (1),
+  threegpp_charging_id                    (2),
+  threegpp_pdp_type                       (3),
+  threegpp_charging_gateway_address       (4),
+  threegpp_gprs_negotiated_qos_profile    (5),
+  threegpp_sgsn_ip_address                (6),
+  threegpp_ggsn_ip_address                (7),
+  threegpp_imsi_mcc_mnc                   (8),
+  threegpp_ggsn_mcc_mnc                   (9),
+  threegpp_nsapi                         (10),
+  threegpp_session_stop_indicator        (11),
+  threegpp_selection_mode                (12),
+  threegpp_charging_characteristics      (13),
+  threegpp_cg_ipv6_address               (14),
+  threegpp_sgsn_ipv6_address             (15),
+  threegpp_ggsn_ipv6_address             (16),
+  threegpp_ipv6_dns_servers              (17),
+  threegpp_sgsn_mcc_mnc                  (18),
+  threegpp_teardown_indicator            (19),
+  threegpp_imeisv                        (20),
+  threegpp_rat_type                      (21),
+  threegpp_user_location_info            (22),
+  threegpp_ms_timezone                   (23),
+  threegpp_camel_charging_info           (24),
+  threegpp_packet_filter                 (25),
+  threegpp_negotiated_dscp               (26),
+  threegpp_chargeable_user_identity      (89) // FIXME no standard reference available ETIBSZA
+} 
+
+
+type enum_8 servicefactory_type_enum
+{
+  servicefactory_product_profile_id    (1),
+  servicefactory_access_point_id       (7),
+  servicefactory_apn                  (14) // FIXME no standard reference available ETIBSZA
+} 
+
+
+type enum_8 microsoft_type_enum
+{
+  microsoft_chap_mppe_keys    (12),
+  microsoft_mppe_send_key     (16),
+  microsoft_mppe_recv_key     (17),
+  microsoft_primary_dns_server   (28),
+  microsoft_secondary_dns_server (29),
+  microsoft_primary_nbns_server   (30),
+  microsoft_secondary_nbns_server (31)
+} 
+
+type enum_8 adslforum_type_enum
+{
+  adslforum_agent_circuit_id (1)
+} 
+
+
+type enum_8 wispr_type_enum
+{
+  wispr_location_id (1),
+  wispr_location_name(2)
+} 
+
+type enum_8 scap_type_enum
+{
+  requested_service_unit        (1),
+  used_service_unit             (2),
+  granted_service_unit          (3),
+  unit_type                     (4),
+  unit_value                    (5),
+  value_digits                  (6),
+  exponent                      (7),
+  currency_code                 (8),
+  subscription_id               (9),
+  additional_subscription_id    (10),
+  subscription_id_type          (11),
+  subscription_id_data          (12),
+  event_timestamp               (13),
+  accounting_record_number      (14),
+  result_code                   (15),
+  accounting_interim_interval   (16),
+  origin_state_id               (17),
+  suggested_primary_rulespace   (30),
+  suggested_secondary_rulespace (31)
+} 
+
+
+type enum_8 scap_unit_type_enum {
+  SERVICE_CREDIT_TIME     (0),
+  SERVICE_CREDIT_VOLUME   (1),
+  SERVICE_CREDIT_EVENT    (2),
+  SERVICE_CREDIT_MONEY    (3)
+} 
+
+
+type enum_8 scap_subsription_id_type_enum {
+  END_USER_MSISDN   (0),
+  END_USER_IMSI     (1),
+  END_USER_SIP_URL  (2),
+  END_USER_NAI      (3),
+  END_USER_PRIVATE  (4)
+} 
+
+type record scap_unit_type_t {
+  scap_type_enum      scap_type,
+  UINT8               scap_length,
+  INT32             scap_val
+} with {
+    variant (scap_length) "LENGTHTO(scap_type, scap_length, scap_val)"
+}
+
+type set of scap_unit_type_t unit_value_list;
+
+type union unit_value_t
+{
+  octetstring                   string_val,
+  scap_unit_type_enum           unit_type_val,
+  scap_subsription_id_type_enum subsription_id_type_val,
+  unit_value_list               unit_type_list,
+  INT32                       integer_val,
+  charstring                    unichar_val
+} 
+
+
+type record service_unit_t {
+  scap_type_enum        scap_type,
+  UINT8                 scap_length,
+  unit_value_t          scap_val
+} with {
+  variant (scap_length) "LENGTHTO(scap_type, scap_length, scap_val)";
+  variant (scap_val) "CROSSTAG(
+  unit_type_val,           scap_type=unit_type;
+  unit_type_list,          scap_type=unit_value;
+  integer_val,             scap_type=value_digits;
+  integer_val,             scap_type=exponent;
+  integer_val,             scap_type=currency_code;
+  unit_type_list,          scap_type=subscription_id;
+  integer_val,             scap_type=additional_subscription_id;
+  subsription_id_type_val, scap_type=subscription_id_type;
+  unichar_val,             scap_type=subscription_id_data;
+  integer_val,             scap_type=event_timestamp;
+  integer_val,             scap_type=accounting_record_number;
+  integer_val,             scap_type=result_code;
+  integer_val,             scap_type=accounting_interim_interval;
+  integer_val,             scap_type=origin_state_id)"
+ }
+
+
+type set of service_unit_t service_unit_list;
+
+
+type union scap_value {
+  octetstring                   string_val,
+  scap_unit_type_enum           unit_type_val,
+  unit_value_list               unit_type_list,
+  service_unit_list             f_service_unit_list,
+  scap_subsription_id_type_enum subscription_id_type_val,
+  INT32                       integer_val,
+  charstring                    unichar_val,
+  charstring                    charstring_val
+}  
+
+
+type record scap_subattr_t {
+  scap_type_enum      scap_type,
+  UINT8               scap_length,
+  scap_value          scap_val
+} with {
+  variant (scap_length) "LENGTHTO(scap_type, scap_length, scap_val)";
+  variant (scap_val) "CROSSTAG(
+    f_service_unit_list,      scap_type=requested_service_unit;
+    f_service_unit_list,      scap_type=used_service_unit;
+    f_service_unit_list,      scap_type=granted_service_unit;
+    unit_type_val,            scap_type=unit_type;
+    unit_type_list,           scap_type=unit_value;
+    integer_val,              scap_type=value_digits;
+    integer_val,              scap_type=exponent;
+    integer_val,              scap_type=currency_code;
+    f_service_unit_list,      scap_type=subscription_id;
+    integer_val,              scap_type=additional_subscription_id;
+    subscription_id_type_val, scap_type=subscription_id_type;
+    unichar_val,              scap_type=subscription_id_data;
+    integer_val,              scap_type=event_timestamp;
+    integer_val,              scap_type=accounting_record_number;
+    integer_val,              scap_type=result_code;
+    integer_val,              scap_type=accounting_interim_interval;
+    integer_val,              scap_type=origin_state_id;
+    charstring_val,           scap_type=suggested_primary_rulespace;
+    charstring_val,           scap_type=suggested_secondary_rulespace)"
+  }
+
+type set of scap_subattr_t scap_subattr_list;
+
+
+
+
+
+type record acc_type
+{
+  acc_type_enum                   f_acc_type,
+  UINT8                           attrib_length_spec,
+  octetstring                     string_val
+} with {
+  variant (attrib_length_spec) "LENGTHTO(f_acc_type, attrib_length_spec, string_val)"
+  }
+
+type set of acc_type acc_subattr_list;
+
+type record cisco_type
+{
+  cisco_type_enum                 f_cisco_type,
+  UINT8                           attrib_length_spec,
+  octetstring                     string_val
+} with {
+  variant (attrib_length_spec) "LENGTHTO(f_cisco_type, attrib_length_spec, string_val)"
+  }
+
+type set of cisco_type cisco_subattr_list;
+
+
+type record ericsson_type
+{
+  ericsson_type_enum              f_ericsson_type,
+  UINT8                           attrib_length_spec,
+  octetstring                     string_val
+} with {
+  variant (attrib_length_spec) "LENGTHTO(f_ericsson_type, attrib_length_spec, string_val)"
+  }
+
+type set of ericsson_type ericsson_subattr_list;
+
+
+type record cdma2000_type
+{
+  cdma2000_type_enum              f_cdma2000_type,
+  UINT8                           attrib_length_spec,
+  octetstring                     string_val
+} with {
+  variant (attrib_length_spec) "LENGTHTO(f_cdma2000_type, attrib_length_spec,string_val)"
+  }
+
+type set of cdma2000_type cdma2000_subattr_list;
+
+
+type record threegpp_type
+{
+  threegpp_type_enum              f_threegpp_type,
+  UINT8                           attrib_length_spec,
+  octetstring                     string_val
+} with {
+  variant (attrib_length_spec) "LENGTHTO(f_threegpp_type, attrib_length_spec, string_val)"
+  }
+
+type set of threegpp_type threegpp_subattr_list;
+
+type record microsoft_type
+{
+  microsoft_type_enum             f_microsoft_type,
+  UINT8                           attrib_length_spec,
+  octetstring                     string_val
+} with {
+  variant (attrib_length_spec) "LENGTHTO(f_microsoft_type, attrib_length_spec, string_val)"
+  }
+
+type set of microsoft_type microsoft_subattr_list;
+
+type record servicefactory_type
+{
+  servicefactory_type_enum        f_servicefactory_type,
+  UINT8                           attrib_length_spec,
+  octetstring                     string_val
+} with {
+  variant (attrib_length_spec) "LENGTHTO(f_servicefactory_type, attrib_length_spec, string_val)"
+  }
+
+type set of servicefactory_type servicefactory_subattr_list;
+
+type record adslforum_type
+{
+  adslforum_type_enum             f_adslforum_type,
+  UINT8                           attrib_length_spec,
+  octetstring                     string_val
+} with {
+  variant (attrib_length_spec) "LENGTHTO(f_adslforum_type, attrib_length_spec, string_val)"
+  }
+
+type set of adslforum_type adslforum_subattr_list;
+
+
+type record wispr_type
+{
+  wispr_type_enum                 f_wispr_type,
+  UINT8                           attrib_length_spec,
+  octetstring                     string_val
+} with {
+  variant (attrib_length_spec) "LENGTHTO(f_wispr_type, attrib_length_spec, string_val)"
+  }
+
+type set of wispr_type wispr_subattr_list;
+
+
+
+type union string_val_spec
+{
+  acc_subattr_list            f_acc_subattr_list,
+  cisco_subattr_list          f_cisco_subattr_list,
+  ericsson_subattr_list       f_ericsson_subattr_list,
+  cdma2000_subattr_list       f_cdma2000_subattr_list,
+  threegpp_subattr_list       f_threegpp_subattr_list,
+  microsoft_subattr_list      f_microsoft_subattr_list,
+  servicefactory_subattr_list f_servicefactory_subattr_list,
+  adslforum_subattr_list      f_adslforum_subattr_list,
+  wispr_subattr_list          f_wispr_subattr_list,
+  scap_subattr_list           f_scap_subattr_list,
+  octetstring                 f_string_val
+}
+
+
+
diff --git a/src/obsolate/RadiusBaseTypes.rdf b/src/obsolate/RadiusBaseTypes.rdf
new file mode 100644
index 0000000000000000000000000000000000000000..94a38729282447d7c45e46dab877a9cc633a30a4
--- /dev/null
+++ b/src/obsolate/RadiusBaseTypes.rdf
@@ -0,0 +1,92 @@
+/******************************************************************************
+* Copyright (c) 2008, 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
+* Endre Kulcsar
+* Gabor Szalai
+* Janos Kovesdi
+* Kulcsár Endre
+* Zoltan Medve
+* Tamas Korosi
+******************************************************************************/
+
+//
+//  File:               RadiusBaseTypes.rdf
+//  Rev:                <RnXnn>
+//  Prodnr:             CNL 113 600
+//  Reference:          RFC 2865(RADIUS)       
+//                       
+//                      
+//
+
+
+//
+// External functions for encoding and decoding
+//
+
+external function f_RADIUS_Enc(in PDU_RADIUS pdu) return octetstring;
+external function f_RADIUS_Dec(in octetstring stream) return PDU_RADIUS;
+external function crypt_password(in octetstring P,in octetstring req_auth,in octetstring salt,in boolean decrypt,in charstring secret) return octetstring; 
+external function f_calc_MD5(in octetstring input) return octetstring; 
+
+
+
+//
+// Basic type definitions
+//
+
+type integer UINT8 (0..255) with {
+variant "FIELDLENGTH(8)"
+variant "BYTEORDER(last)"
+}
+
+type integer UINT16 (0..65535) with {
+variant "FIELDLENGTH(16)"
+variant "BYTEORDER(last)"
+}
+
+type integer UINT24 (0..16777215) with {
+variant "FIELDLENGTH(24)"
+variant "BYTEORDER(last)"
+}
+
+type integer UINT32 (0..4294967296) with {
+variant "FIELDLENGTH(32)"
+variant "BYTEORDER(last)"
+}
+
+type integer UINT64 with {
+variant "FIELDLENGTH(64)"
+variant "BYTEORDER(last)"
+}
+
+type integer INT32 with {
+variant "FIELDLENGTH(32)"
+variant "BYTEORDER(last)"
+variant "COMP(2scompl)"
+}
+
+type octetstring OCTET1 length(1) 
+type octetstring OCTET2 length(2) 
+type octetstring OCTET3 length(3)
+type octetstring OCTET4 length(4)
+type octetstring OCTET8 length(8)
+type octetstring OCTET16 length(16)
+
+//
+//  Basic Attribute Data Formats
+//
+
+type charstring Attrib_Text length(1..253) with { variant "PADDING(yes)"};
+type octetstring Attrib_String length(1..253);
+type OCTET4 Attrib_Address;
+type OCTET4 Attrib_Time;
+type UINT32 Attrib_Value;
+
+
+
diff --git a/src/obsolate/RadiusExtensions.rdf b/src/obsolate/RadiusExtensions.rdf
new file mode 100644
index 0000000000000000000000000000000000000000..ab4c0e1570192161f282d2e32b831c526aa63a6c
--- /dev/null
+++ b/src/obsolate/RadiusExtensions.rdf
@@ -0,0 +1,124 @@
+/******************************************************************************
+* Copyright (c) 2008, 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
+* Endre Kulcsar
+* Gabor Szalai
+* Janos Kovesdi
+* Kulcsár Endre
+* Zoltan Medve
+* Tamas Korosi
+******************************************************************************/
+
+//
+//  File:               RadiusExtensions.rdf
+//  Rev:                <RnXnn>
+//  Prodnr:             CNL 113 600
+//  Reference:          RFC 2866(RADIUS Extensions)       
+//                       
+//                      
+//
+
+
+// APPLICATION-NAME: Ext
+
+// RFC 2869
+// Attrib: Acct-Input-Gigawords (52)
+type Attrib_Value Acct_Input_Gigawords;
+
+// RFC 2869
+// Attrib: Acct-Output-Gigawords (53)
+type Attrib_Value Acct_Output_Gigawords;
+
+// RFC 2869
+// Attrib: Event-Timestamp (55)
+type Attrib_Value Event_Timestamp;
+
+// RFC 2869
+// Attrib: ARAP-Password (70)
+type record ARAP_Password
+{
+  Attrib_Value Value1,
+  Attrib_Value Value2,
+  Attrib_Value Value3,
+  Attrib_Value Value4
+}
+
+// RFC 2869
+// Attrib: ARAP-Features (71)
+type record ARAP_Features
+{
+  UINT8 variable_password,
+  UINT8 password_length,
+  Attrib_Time creation_time,
+  Attrib_Value expiration_time,
+  Attrib_Time radius_time
+}
+
+// RFC 2869
+// Attrib: ARAP-Zone-Access (72)
+type enumerated ARAP_Zone_Access
+{
+  To_default_zone (1),
+  Use_zone_filter_inclusively (2),
+  Use_zone_filter_exclusively (3)
+}
+
+// RFC 2869
+// Attrib: ARAP-Security (73)
+type Attrib_Value ARAP_Security;
+
+// RFC 2869
+// Attrib: ARAP-Security-Data (74)
+type Attrib_String ARAP_Security_Data;
+
+// RFC 2869
+// Attrib: Password-Retry (75)
+type Attrib_Value Password_Retry;
+
+// RFC 2869
+// Attrib: Prompt (76)
+type enumerated Prompt
+{
+  No_Echo (0),
+  Echo (1)
+}
+
+// RFC 2869
+// Attrib: Connect-Info (77)
+type Attrib_Text Connect_Info;
+
+// RFC 2869
+// Attrib: Configuration-Token (78)
+type Attrib_String Configuration_Token;
+
+// RFC 2869
+// Attrib: EAP-Message (79)
+type Attrib_String EAP_Message;
+
+// RFC 2869
+// Attrib: Message-Authenticator (80)
+type Attrib_String Message_Authenticator;
+
+// RFC 2869
+// Attrib: ARAP-Challenge-Response (84)
+type UINT64 ARAP_Challenge_Response;
+
+// RFC 2869
+// Attrib: Acct-Interim-Interval (85)
+type Attrib_Value Acct_Interim_Interval;
+
+// RFC 2869
+// Attrib: NAS-Port-Id (87)
+type Attrib_Text NAS_Port_Id;
+
+// RFC 2869
+// Attrib: Framed-Pool (88)
+type Attrib_String Framed_Pool;
+
+
diff --git a/src/obsolate/RadiusGGSN.rdf b/src/obsolate/RadiusGGSN.rdf
new file mode 100644
index 0000000000000000000000000000000000000000..6b75e80454538dae9da8a8421e4cd1b50f6ac01e
--- /dev/null
+++ b/src/obsolate/RadiusGGSN.rdf
@@ -0,0 +1,54 @@
+/******************************************************************************
+* Copyright (c) 2008, 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
+* Endre Kulcsar
+* Gabor Szalai
+* Janos Kovesdi
+* Kulcsár Endre
+* Zoltan Medve
+* Tamas Korosi
+******************************************************************************/
+
+//
+//  File:               RadiusGGSN.rdf
+//  Rev:                <RnXnn>
+//  Prodnr:             CNL 113 600
+//  Reference:          GGSN Functional Specification: RADIUS       
+//                      46/155 17-CSA 113 35/4 Uen Rev B 
+//                      
+//
+
+
+// APPLICATION-NAME: Ggsn
+
+// Attrib: Imsi (224)
+type Attrib_Text Imsi;
+
+// Attrib: Charging-Id (225)
+type Attrib_Value Charging_Id;
+
+// Attrib: Imsi-Mcc-Mnc (226)
+type Attrib_Text Imsi_Mcc_Mnc;
+
+// Attrib: Sgsn-IP-Address (228)
+type Attrib_Address Sgsn_IP_Address;
+
+// Attrib: Selection-Mode (229)
+type Attrib_Text Selection_Mode;
+
+// Attrib: Ggsn-Gtp-IP-Address (230)
+type Attrib_Address Ggsn_Gtp_IP_Address;
+
+// Attrib: Primary-Dns-Server (135)
+type Attrib_Address Primary_Dns_Server;
+
+// Attrib: Secondary-Dns-Server (136)
+type Attrib_Address Secondary_Dns_Server;
+
+
diff --git a/src/obsolate/TunnelAuthenticationAttributes.rdf b/src/obsolate/TunnelAuthenticationAttributes.rdf
new file mode 100644
index 0000000000000000000000000000000000000000..bd880c5a24c4482d77c0858ad5be7745e5ad5f51
--- /dev/null
+++ b/src/obsolate/TunnelAuthenticationAttributes.rdf
@@ -0,0 +1,159 @@
+/******************************************************************************
+* Copyright (c) 2008, 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
+* Endre Kulcsar
+* Gabor Szalai
+* Janos Kovesdi
+* Kulcsár Endre
+* Zoltan Medve
+* Tamas Korosi
+******************************************************************************/
+
+//
+//  File:               TunnelAuthenticationAttributes.rdf
+//  Rev:                <RnXnn>
+//  Prodnr:             CNL 113 600
+//  Reference:          RFC 2868(RADIUS Attributes for Tunnel Protocol Support)       
+//                       
+//                      
+//
+
+
+// APPLICATION-NAME: Auth
+
+
+type enum_24 Tunnel_Type_Value
+{
+  PPTP (1),
+  L2F (2),
+  L2TP (3),
+  ATMP (4),
+  VTP (5),
+  AH (6),
+  IP_IP (7),
+  MIN_IP_IP (8),
+  ESP (9),
+  GRE (10),
+  DVS (11),
+  IP_IP_Tunneling (12)
+}
+  
+// RFC 2868
+// Attrib: Tunnel-Type (64)
+type record Tunnel_Type
+{
+  OCTET1 Tag,
+  Tunnel_Type_Value Value
+}
+
+
+type enum_24 Tunnel_Medium_Type_Value
+{
+  IPv4 (1),
+  IPv6 (2),
+  NSAP (3),
+  HDLC (4),
+  BBN_1822 (5),
+  media_plus_Ethernet_802 (6),
+  Epoint163 (7),
+  Epoint164 (8),
+  Fpoint69 (9),
+  Xpoint121 (10),
+  IPX (11),
+  Appletalk (12),
+  Decnet_IV (13),
+  Banyan_Vines (14),
+  Epoint164_with_NSAP_subaddress (15)
+}
+  
+
+// RFC 2868
+// Attrib: Tunnel-Medium-Type (65)
+type record Tunnel_Medium_Type
+{
+  OCTET1 Tag,
+  Tunnel_Medium_Type_Value Value
+}
+
+
+// RFC 2868
+// Attrib: Tunnel-Client-Endpoint (66)
+type record Tunnel_Client_Endpoint
+{
+  OCTET1 Tag,
+  Attrib_String String
+}
+
+// RFC 2868
+// Attrib: Tunnel-Server-Endpoint (67)
+type record Tunnel_Server_Endpoint
+{
+  OCTET1 Tag,
+  Attrib_String String
+} 
+
+type record Tunnel_Password_String
+{
+  UINT8   Data_Length,
+  Attrib_String Password,
+  octetstring Padding_Sub_Field
+} with {
+    variant (Data_Length) "LENGTHTO(Password)"
+}
+
+// RFC 2868
+// Attrib: Tunnel-Password (69)
+type record Tunnel_Password
+{
+  OCTET1 Tag,
+  OCTET2 Salt,
+  Tunnel_Password_String String
+}
+
+// RFC 2868
+// Attrib: Tunnel-Private-Group-ID (81)
+type record Tunnel_Private_Group_ID
+{
+  OCTET1 Tag,
+  Attrib_String String
+}
+
+// RFC 2868
+// Attrib: Tunnel-Assignment-ID (82)
+type record Tunnel_Assignment_ID
+{
+  OCTET1 Tag,
+  Attrib_String String
+}
+
+
+// RFC 2868
+// Attrib: Tunnel-Preference (83)
+type record Tunnel_Preference
+{
+  OCTET1 Tag,
+  Attrib_Value Value
+}
+
+// RFC 2868
+// Attrib: Tunnel-Client-Auth-ID (90)
+type record Tunnel_Client_Auth_ID
+{
+  OCTET1 Tag,
+  Attrib_String String
+}
+
+// RFC 2868
+// Attrib: Tunnel-Server-Auth-ID (91)
+type record Tunnel_Server_Auth_ID
+{
+  OCTET1 Tag,
+  Attrib_String String
+}
+
diff --git a/src/skt.rdf b/src/skt.rdf
index b5e0a2a41d4d0ff50c0c7d4e3987493adf523972..bf2475dd299b18da952a22f333569c054c51bb32 100644
--- a/src/skt.rdf
+++ b/src/skt.rdf
@@ -1,5 +1,5 @@
 /******************************************************************************
-* Copyright (c) 2008, 2016  Ericsson AB
+* Copyright (c) 2008, 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
@@ -31,6 +31,7 @@ type enum_8 skt_type_enum
   service_key                   (1),
   prepaid_expired               (2),
   data_zone_service             (3),
+  low_access_priority           (4),
   preservation_indicator        (17)
 } 
 
@@ -55,7 +56,8 @@ type record skt_subattr_t {
     string_val,               skt_type=preservation_indicator;
     byte_val,                 skt_type=prepaid_expired;
     integer_val,              skt_type=service_key;
-    string_val,               skt_type=data_zone_service)"
+    string_val,               skt_type=data_zone_service;
+    byte_val,                 skt_type=low_access_priority)"
   }
 
 type set of skt_subattr_t skt_subattr_list;