From Josip Medved: Diameter dictionary has few invalid gavp definitions https://bugs...
[obnox/wireshark/wip.git] / diameter / dictionary.xml
index 6a1511cc935062eb338001271176a3dccfba189d..4473dbb6266b6a776fe5d8b1f1ccbd2e890db8c5 100644 (file)
@@ -6,6 +6,7 @@
 
 <!DOCTYPE dictionary SYSTEM "dictionary.dtd" [
        <!ENTITY nasreq SYSTEM "nasreq.xml">
+       <!ENTITY eap SYSTEM "eap.xml">
        <!ENTITY mobileipv4 SYSTEM "mobileipv4.xml">
        <!ENTITY chargecontrol SYSTEM "chargecontrol.xml">
        <!ENTITY sunping SYSTEM "sunping.xml">
        <!ENTITY gqpolicy SYSTEM "gqpolicy.xml">
        <!ENTITY etsie2e4 SYSTEM "etsie2e4.xml">
        <!ENTITY Ericsson SYSTEM "Ericsson.xml">
+       <!ENTITY Tango SYSTEM "Tango.xml">
+  <!ENTITY mobileipv6 SYSTEM "mobileipv6.xml">
+  <!ENTITY Cisco SYSTEM "Cisco.xml">
+  <!ENTITY Vodafone SYSTEM "Vodafone.xml">
 ]>
 <dictionary>
        <base uri="http://www.ietf.org/rfc/rfc3588.txt">
-               <!--
+  <!--
   $Log: dictionary.xml,v $
   Revision 1.1  2001/11/01 21:52:44  guy
   From David Frascone: duUpdate to Diameter dissector to load the
   dictionary as an XML file rather than building it in, and various
   Diameter updates.
 
-  Revision 1.8  2008/01/06 02:49:24  grzegorz  Added missing RFC 3588   
-  AVP 299 by Grzegorz Szczytowski 
+  Revision 1.8  2008/01/06 02:49:24  grzegorz  Added missing RFC 3588
+  AVP 299 by Grzegorz Szczytowski
 
   Revision 1.7  2001/08/24 18:03:24  chaos
   Mark's Changes
   Revision 1.2  2001/07/31 16:29:34  chaos
   Checking in some changes to verify log and ident strings
 
--->
+  -->
                <!-- *********************** Commands ***************************** -->
                <!-- Diameter Base Protocol Command Codes -->
-               <command name="Capabilities-Exchange" code="257" vendor-id="None"/>
-               <command name="Re-Auth" code="258" vendor-id="None"/>
-               <command name="Accounting" code="271" vendor-id="None"/>
-               <command name="Abort-Session" code="274" vendor-id="None">
-               </command>
-               <command name="Session-Termination" code="275" vendor-id="None"/>
-               <command name="Device-Watchdog" code="280" vendor-id="None"/>
-               <command name="Disconnect-Peer" code="282" vendor-id="None"/>
-               <!-- ********************** End Commands ************************** -->
+               <!-- 0-255 RADIUS compatibility codes [http://www.iana.org/assignments/radius-types] -->
+               <!--256 Unassigned -->
+               <command name="Capabilities-Exchange"         code="257" vendor-id="None"/>
+               <command name="Re-Auth"                       code="258" vendor-id="None"/>
+               <!-- 259 Unassigned
+                    260 AMR / AMA [RFC4004]     mobileipv4.xml
+                    261 Unassigned
+                    262 HAR / HAA [RFC4004]     mobileipv4.xml
+                    263-264 Unassigned
+                    265 AAR / AAA [RFC4005]     nasreq.xml
+                    266-267 Unassigned
+                    268 DER / DEA [RFC4072]     eap.xml
+                    269-270 Unassigned
+               -->
+               <command name="Accounting"                    code="271" vendor-id="None"/>
+               <!-- 272 CCR / CCA [RFC4006]     chargecontrol.xml
+                    273 Unassigned
+               -->
+               <command name="Abort-Session"                 code="274" vendor-id="None"/>
+               <command name="Session-Termination"           code="275" vendor-id="None"/>
+               <!--276-279 Unassigned -->
+               <command name="Device-Watchdog"               code="280" vendor-id="None"/>
+               <command name="Disconnect-Peer"               code="282" vendor-id="None"/>
+               <!--283 UAR / UAA [RFC4740]      sip.xml
+                   284 SAR / SAA [RFC4740]      sip.xml
+                   285 LIR / LIA [RFC4740]      sip.xml
+                   286 MAR / MAA [RFC4740]      sip.xml
+                   287 RTR / RTA [RFC4740]      sip.xml
+                   288 PPR / PPA [RFC4740]      sip.xml
+                   289-299 Unassigned
+                   300-313 Allocated for 3GPP [RFC3589]
+                     imscxdx.xml ( 300 - 305 )
+                     300       User-Authorization-Request/-Answer      UAR/UAA 29.229 [2]
+                     301       Server-Assignment-Request/-Answer       SAR/SAA
+                     302       Location-Info-Request/-Answer           LIR/LIA
+                     303       Multimedia-Auth-Request/-Answer         MAR/MAA
+                     304       Registration-Termination-Request/-Answer RTR/RTA
+                     305       Push-Profile-Request/-Answer            PPR/PPA
+                     TGPPSh.xml  ( 306 - 309 )
+                     306       User-Data-Request/-Answer               UDR/UDA
+                     307       Profile-Update-Request/-Answer          PUR/PUA
+                     308       Subscribe-Notifications-Request/-Answer SNR/SNA
+                     309       Push-Notification-Request/-Answer       PNR/PNA
+               -->
+
+               <command name="Boostrapping-Info"             code="310" vendor-id="None"/>        <!-- BIR/BIA 29.109 [7] -->
+               <command name="Message-Process"               code="311" vendor-id="None"/>        <!-- MPR/MPA 29.140 [16] -->
+               <command name="GBAPush-Info"                  code="312" vendor-id="None"/>        <!-- GPR/GPI 29.109 [7] -->
+               <!-- 313 (Not used yet) -->
+               <command name="Policy-Data"                   code="314" vendor-id="None"/>        <!-- PDR / PDA [RFC5224] -->
+               <command name="Policy-Install"                code="315" vendor-id="None"/>        <!-- (PIA) [ITU-T Rec. Q.3303.3][RFC5431] -->
+
+               <!-- http://www.3gpp.org/ftp/Specs/html-info/29272.htm -->
+               <command name="3GPP-Update-Location"            code="316" vendor-id="None"/>
+               <command name="3GPP-Cancel-Location"            code="317" vendor-id="None"/>         <!--[3GPP TS 29.272][RFC5516] -->
+               <command name="3GPP-Authentication-Information" code="318" vendor-id="None"/>         <!--[3GPP TS 29.272][RFC5516] -->
+               <command name="3GPP-Insert-Subscriber-Data"     code="319" vendor-id="None"/>         <!--[3GPP TS 29.272][RFC5516] -->
+               <command name="3GPP-Delete-Subscriber-Data"     code="320" vendor-id="None"/>         <!--[3GPP TS 29.272][RFC5516] -->
+               <command name="3GPP-Purge-UE"                   code="321" vendor-id="None"/>         <!--[3GPP TS 29.272][RFC5516] -->
+               <command name="3GPP-Reset"                      code="322" vendor-id="None"/>         <!--[3GPP TS 29.272][RFC5516] -->
+               <command name="3GPP-Notify"                     code="323" vendor-id="None"/>         <!--[3GPP TS 29.272][RFC5516] -->
+               <command name="3GPP-ME-Identity-Check"          code="324" vendor-id="None"/>         <!--(ECR/ECA) [3GPP TS 29.272][RFC5516] -->
+               <command name="MIP6"                            code="325" vendor-id="None"/>         <!--(MIR/MIA) [RFC5778] -->
+               <command name="QoS-Authorization"               code="326" vendor-id="None"/>         <!--(QAR/QAA) [RFC5866] -->
+    <command name="QoS-Install"                     code="327" vendor-id="None"/>         <!--(QIR/QIA) [RFC5866] -->
+    <command name="Capabilities-Update"             code="328" vendor-id="None"/>         <!--[RFC-ietf-dime-capablities-update-07] -->
+    <command name="IKEv2-SK"                        code="329" vendor-id="None"/>         <!--[RFC-ietf-dime-ikev2-psk-diameter-11] -->
+    <!--
+               330-8388607 Unassigned
+               8388608 WIMAX-HRPD-SFF Request/Answer [http://www.3gpp2.org/Public_html/specs/tsgx.cfm][3GPP2 X.S0058-0 v1.0][Avi_Lior]
+               8388609 WiMAX-Diameter-EAP-Request/Answer (WDER/WDEA) WDE [http://www.wimaxforum.org/resources/documents/technical/T33][WiMAX Release 1.5][Avi_Lior]
+               8388610 WiMAX-Change-of-Authorization-Request/Answer (WCAR/WCAA) WCA [http://www.wimaxforum.org/resources/documents/technical/T33][WiMAX Release 1.5][Avi_Lior]
+               8388611 WiMAX-Reauthentication-Request/Answer (WRAR/WRAA) WRA [http://www.wimaxforum.org/resources/documents/technical/T33][WiMAX Release 1.5][Avi_Lior]
+               8388612 WiMAX-Session-Termination-Request/Answer (WSTR/WSTA) WST [http://www.wimaxforum.org/resources/documents/technical/T33][WiMAX Release 1.5][Avi_Lior]
+               8388613 WiMAX-Abort-Session-Request/Answer (WASR/WASA) WAS [http://www.wimaxforum.org/resources/documents/technical/T33][WiMAX Release 1.5][Avi_Lior]
+               8388614 WiMAX-Home-Agent-IPv4-Request/Answer (WHA4R/WHA4A) WHA4 [http://www.wimaxforum.org/resources/documents/technical/T33][WiMAX Release 1.5][Avi_Lior]
+               8388615 WiMAX-Home-Agent-IPv6-Request/Answer (WHA6R/WHA6A) WHA6 [http://www.wimaxforum.org/resources/documents/technical/T33][WiMAX Release 1.5][Avi_Lior]
+               8388616 WiMAX-DHCP-Request/Answer (WDHCPR/WDHCPA) WDHCP [http://www.wimaxforum.org/resources/documents/technical/T33][WiMAX Release 1.5][Avi_Lior]
+               8388617 WiMAX-LAA-Request/Answer (WLAAR/WLAA) WLAA [http://www.wimaxforum.org/resources/documents/technical/T33][WiMAX Release 1.5][Avi_Lior]
+               8388618 WiMAX-Location-Accounting-Request/Answer (WLACR/WLACA) WLAC [http://www.wimaxforum.org/resources/documents/technical/T33][WiMAX Release 1.5][Avi_Lior]
+               8388619 WiMAX-Location-Measurement-Query-Request/Answer (WLMQR/WLMQA) WLMQ [http://www.wimaxforum.org/resources/documents/technical/T33][WiMAX Release 1.5][Avi_Lior]
+    -->
+    <command name="3GPP-Provide-Location"           code="8388620" vendor-id="None"/>         <!--(PLR/PLA) [http://www.3gpp.org/ftp/Specs/][3GPP TS 29.172 -->
+    <command name="3GPP-Location-Report"            code="8388621" vendor-id="None"/>         <!--(PLR/PLA) [http://www.3gpp.org/ftp/Specs/][3GPP TS 29.172 -->
+    <command name="3GPP-LCS-Routing-Info"           code="8388622" vendor-id="None"/>         <!--(PLR/PLA) [http://www.3gpp.org/ftp/Specs/][3GPP TS 29.172 -->
+<!-- 
+8388623 Notif-Request/Answer (NFR/NFA) [Tomas_Menzl] 
+8388624 Msg-Interface-Request/Answer (MIFR/MIFA) [Tomas_Menzl] 
+8388625 Mobile-Application-Request/Answer (MAPR/MAPA) [Tomas_Menzl] 
+8388626 Update Location Request/Answer (ULR / ULA) [3GPP2 publication X.S0057][Avi_Lior] 
+8388627 Cancel Location Request/Answer (CLR CLA) [3GPP2 publication X.S0057][Avi_Lior] 
+8388628 Juniper-Sync-Event (JSE) [Aleksey_Romanov] 
+8388629 Juniper-Session-Discovery (JSD) [Aleksey_Romanov] 
+8388630 Query Profile Request Answer (QPR/QPA) [3GPP2 publication X.S0057A E-UTRAN eHRPD7][Avi_Lior] 
+
+-->
+    <command name="Subscription Information Application" code="8388631" vendor-id="None"/>
+    <command name="Distributed Charging"                 code="8388632" vendor-id="None"/>
+    <command name="Ericsson-SL"                          code="8388633" vendor-id="None"/> <!-- Ericsson Spending Limit -->
+    <command name="Ericsson-SN"                          code="8388634" vendor-id="None"/> <!-- Ericsson Spending Status Notification -->
+    <!-- 
+    8388623-16777213 Unassigned
+    16777214 Experimental code [RFC3588]
+    16777215 Experimental code [RFC3588]
+    -->
+    <!-- ********************** End Commands ************************** -->
                <!-- ************************* Vendors **************************** -->
                <vendor vendor-id="None" code="0" name="None"/>
                <vendor vendor-id="HP"    code="11"    name="Hewlett Packard"/>
                <vendor vendor-id="Merit" code="61" name="Merit Networks"/>
                <vendor vendor-id="Sun" code="42" name="Sun Microsystems, Inc."/>
                <vendor vendor-id="USR" code="429" name="US Robotics Corp."/>
-               <vendor vendor-id="3GPP2" code="5535" name="3GPP2"/>
-               <vendor vendor-id="TGPP"  code="10415" name="3GPP"/>
+    <vendor vendor-id="Cisco" code="5771" name="Cisco"/>
+    <vendor vendor-id="TGPP2" code="5535" name="3GPP2"/>
+    <vendor vendor-id="TGPP"  code="10415" name="3GPP"/>
                <vendor vendor-id="TGPPCX" code="16777216" name="3GPP CX/DX"/>
                <vendor vendor-id="Ericsson"  code="193" name="Ericsson"/>
                <vendor vendor-id="ETSI"  code="13019" name="ETSI"/>
                <vendor vendor-id="Vodafone" code="12645" name="Vodafone"/>
+               <vendor vendor-id="Deutsche_Telekom_AG" code="2937" name="Deutsche Telekom AG"/>
+               <vendor vendor-id="Tango" code="13421" name="Tango Telecom Limited"/>
                <!-- *********************** End Vendors ************************** -->
                <!-- ************************ typedefn's ************************** -->
                <typedefn type-name="OctetString"/>
                <!--
-         The data contains arbitrary data of variable length. Unless
-         otherwise noted, the AVP Length field MUST be set to at least 9
-         (13 if the 'V' bit is enabled).  Data used to transmit (human
-         readable) character string data uses the UTF-8 [24] character
-         set and is NOT NULL-terminated. The minimum Length field MUST
-         be 9, but can be set to any value up to 65504 bytes. AVP Values
-         of this type that do not align on a 32-bit boundary MUST have
-         the necessary padding.
-        -->
+                       The data contains arbitrary data of variable length. Unless
+                       otherwise noted, the AVP Length field MUST be set to at least 9
+                       (13 if the 'V' bit is enabled).  Data used to transmit (human
+                       readable) character string data uses the UTF-8 [24] character
+                       set and is NOT NULL-terminated. The minimum Length field MUST
+                       be 9, but can be set to any value up to 65504 bytes. AVP Values
+                       of this type that do not align on a 32-bit boundary MUST have
+                       the necessary padding.
+               -->
                <typedefn type-name="UTF8String" type-parent="OctetString"/>
                <!--
-         The UTF8String format is derived from the OctetString AVP Base
-         Format. This is a human readable string represented using the
-         ISO/IEC IS 10646-1 character set, encoded as an OctetString
-         using the UTF-8 [29] transformation format described in RFC
-         2279.
-
-         Since additional code points are added by amendments to the
-         10646 standard from time to time, implementations MUST be
-         prepared to encounter any code point from 0x00000001 to
-         0x7fffffff. Byte sequences that do not correspond to the valid
-         UTF-8 encoding of a code point or are outside this range are
-         prohibited. Note that since a code point of 0x00000000 is
-         prohibited, no octet will contain a value of 0x00.
-
-         The use of control codes SHOULD be avoided. When it is
-         necessary to represent a newline, the control code sequence CR
-         LF SHOULD be used.
-
-         The use of leading or trailing white space SHOULD be avoided.
-
-         For code points not directly supported by user interface
-         hardware or software, an alternative means of entry and
-         display, such as hexadecimal, MAY be provided.
-
-         For information encoded in 7-bit US-ASCII, the UTF-8 encoding
-         is identical to the US-ASCII encoding.
-
-         UTF-8 may require multiple bytes to represent a single
-         character / code point; thus the length of a UTF8String in
-         octets may be different from the number of characters encoded.
-
-         Note that the size of an UTF8String is measured in octets, not
-         characters.
-
-         The UTF8String MUST not contain any octets with a value of
-         zero.
-        -->
+                       The UTF8String format is derived from the OctetString AVP Base
+                       Format. This is a human readable string represented using the
+                       ISO/IEC IS 10646-1 character set, encoded as an OctetString
+                       using the UTF-8 [29] transformation format described in RFC
+                       2279.
+
+                       Since additional code points are added by amendments to the
+                       10646 standard from time to time, implementations MUST be
+                       prepared to encounter any code point from 0x00000001 to
+                       0x7fffffff. Byte sequences that do not correspond to the valid
+                       UTF-8 encoding of a code point or are outside this range are
+                       prohibited. Note that since a code point of 0x00000000 is
+                       prohibited, no octet will contain a value of 0x00.
+
+                       The use of control codes SHOULD be avoided. When it is
+                       necessary to represent a newline, the control code sequence CR
+                       LF SHOULD be used.
+
+                       The use of leading or trailing white space SHOULD be avoided.
+
+                       For code points not directly supported by user interface
+                       hardware or software, an alternative means of entry and
+                       display, such as hexadecimal, MAY be provided.
+
+                       For information encoded in 7-bit US-ASCII, the UTF-8 encoding
+                       is identical to the US-ASCII encoding.
+
+                       UTF-8 may require multiple bytes to represent a single
+                       character / code point; thus the length of a UTF8String in
+                       octets may be different from the number of characters encoded.
+
+                       Note that the size of an UTF8String is measured in octets, not
+                       characters.
+
+                       The UTF8String MUST not contain any octets with a value of
+                       zero.
+               -->
                <typedefn type-name="IPAddress" type-parent="OctetString"/>
                <!--
-         The IPAddress format is derived from the OctetString AVP Base
-         Format. It represents 32 bit (IPv4) [17] or 128 bit (IPv6) [16]
-         address, most significant octet first. The format of the
-         address (IPv4 or IPv6) is determined by the length. If the
-         attribute value is an IPv4 address, the AVP Length field MUST
-         be 12 (16 if 'V' bit is enabled), otherwise the AVP Length
-         field MUST be set to 24 (28 if the 'V' bit is enabled) for IPv6
-         addresses.
-        -->
+                       The IPAddress format is derived from the OctetString AVP Base
+                       Format. It represents 32 bit (IPv4) [17] or 128 bit (IPv6) [16]
+                       address, most significant octet first. The format of the
+                       address (IPv4 or IPv6) is determined by the length. If the
+                       attribute value is an IPv4 address, the AVP Length field MUST
+                       be 12 (16 if 'V' bit is enabled), otherwise the AVP Length
+                       field MUST be set to 24 (28 if the 'V' bit is enabled) for IPv6
+                       addresses.
+               -->
                <typedefn type-name="DiameterIdentity" type-parent="OctetString"/>
                <!--
-         The DiameterIdentity format is derived from the OctetString AVP
-         Base Format.  It uses the UTF-8 encoding and has the same
-         requirements as the UTF8String.  In addition, it must follow
-         the Uniform Resource Identifiers (URI) syntax [29] rules
-         specified below:
-
-            Diameter-Identity  = fqdn [ port ] [ transport ]
-                                 [ protocol ]
-
-            aaa-protocol       = ( "diameter" | "radius" | "tacacs+" )
-
-            protocol           = ";protocol=" aaa-protocol
-                                 ; If absent, the default AAA protocol
-                                 ; is diameter.
-
-            fqdn               = Fully Qualified Host Name
-
-            port               = ":" 1*DIGIT
-                                 ; One of the ports used to listen for
-                                 ; incoming connections. ; If absent,
-                                 ; the default Diameter port (TBD) is
-                                 ; assumed.
-
-            transport-protocol = ( "tcp" | "sctp" | "udp" )
-
-            transport          = ";transport=" transport-protocol
-
-                                 ; One of the transports used to listen
-                                 ; for incoming connections. If absent,
-                                 ; the default SCTP [26] protocol is
-                                 ; assumed. UDP MUST NOT be used when
-                                 ; the aaa-protocol field is set to
-                                 ; diameter.
-
-            The following are examples of valid Diameter host
-            identities:
-
-               host.abc.com;transport=tcp
-               host.abc.com:6666;transport=tcp
-               aaa://host.abc.com;protocol=diameter
-               aaa://host.abc.com:6666;protocol=diameter
-               aaa://host.abc.com:6666;transport=tcp;protocol=diameter
-               aaa://host.abc.com:1813;transport=udp;protocol=radius
-
-         Since multiple Diameter processes on a single host cannot
-         listen for incoming connections on the same port on a given
-         protocol, the DiameterIdentity is guaranteed to be unique per
-         host.
-
-         A Diameter node MAY advertise different identities on each
-         connection, via the CER and CEA's Origin-Host AVP, but the same
-         identity MUST be used throughout the duration of a connection.
-
-         When comparing AVPs of this format, it is necessary to add any
-         absent fields with the default values prior to the comparison.
-         For example, diameter-host.abc.com would be expanded to
-         aaa://diameter/diameter-host.abc.com:TBD;protocol=sctp.
-        -->
+                       The DiameterIdentity format is derived from the OctetString AVP
+                       Base Format.  It uses the UTF-8 encoding and has the same
+                       requirements as the UTF8String.  In addition, it must follow
+                       the Uniform Resource Identifiers (URI) syntax [29] rules
+                       specified below:
+
+                          Diameter-Identity  = fqdn [ port ] [ transport ]
+                                               [ protocol ]
+
+                          aaa-protocol       = ( "diameter" | "radius" | "tacacs+" )
+
+                          protocol           = ";protocol=" aaa-protocol
+                                               ; If absent, the default AAA protocol
+                                               ; is diameter.
+
+                          fqdn               = Fully Qualified Host Name
+
+                          port               = ":" 1*DIGIT
+                                               ; One of the ports used to listen for
+                                               ; incoming connections. ; If absent,
+                                               ; the default Diameter port (TBD) is
+                                               ; assumed.
+
+                          transport-protocol = ( "tcp" | "sctp" | "udp" )
+
+                          transport          = ";transport=" transport-protocol
+
+                                               ; One of the transports used to listen
+                                               ; for incoming connections. If absent,
+                                               ; the default SCTP [26] protocol is
+                                               ; assumed. UDP MUST NOT be used when
+                                               ; the aaa-protocol field is set to
+                                               ; diameter.
+
+                          The following are examples of valid Diameter host
+                          identities:
+
+                             host.abc.com;transport=tcp
+                             host.abc.com:6666;transport=tcp
+                             aaa://host.abc.com;protocol=diameter
+                             aaa://host.abc.com:6666;protocol=diameter
+                             aaa://host.abc.com:6666;transport=tcp;protocol=diameter
+                             aaa://host.abc.com:1813;transport=udp;protocol=radius
+
+                       Since multiple Diameter processes on a single host cannot
+                       listen for incoming connections on the same port on a given
+                       protocol, the DiameterIdentity is guaranteed to be unique per
+                       host.
+
+                       A Diameter node MAY advertise different identities on each
+                       connection, via the CER and CEA's Origin-Host AVP, but the same
+                       identity MUST be used throughout the duration of a connection.
+
+                       When comparing AVPs of this format, it is necessary to add any
+                       absent fields with the default values prior to the comparison.
+                       For example, diameter-host.abc.com would be expanded to
+                       aaa://diameter/diameter-host.abc.com:TBD;protocol=sctp.
+               -->
                <typedefn type-name="IPFilterRule" type-parent="OctetString"/>
                <!--
-         The IPFilterRule format is derived from the OctetString AVP
-         Base Format.  It uses the UTF-8 encoding and has the same
-         requirements as the UTF8String. Packets may be filtered based
-         on the following information that is associated with it:
-
-            Direction                          (in or out)
-            Source and destination IP address  (possibly masked)
-            Protocol
-            Source and destination port        (lists or ranges)
-            TCP flags
-            IP fragment flag
-            IP options
-            ICMP types
-
-         Rules for the appropriate direction are evaluated in order,
-         with the first matched rule terminating the evaluation.  Each
-         packet is evaluated once. If no rule matches, the packet is
-         dropped if the last rule evaluated was a permit, and passed if
-         the last rule was a deny.
-
-         IPFilterRule filters MUST follow the format:
-
-            action dir proto from src to dst [options]
-
-            action       permit - Allow packets that match the rule.
-                         deny   - Drop packets that match the rule.
-
-            dir          "in" is from the terminal, "out" is to the
-                         terminal.
-
-            proto        An IP protocol specified by number.  The "ip"
-                         keyword means any protocol will match.
-
-            src and dst  <address/mask> [ports]
-
-                         The <address/mask> may be specified as:
-                         ipno       An IPv4 or IPv6 number in dotted-
-                                    quad or canonical IPv6 form. Only
-                                    this exact IP number will match the
-                                    rule.
-                         ipno/bits  An IP number as above with a mask
-                                    width of the form 1.2.3.4/24.  In
-                                    this case all IP numbers from
-                                    1.2.3.0 to 1.2.3.255 will match.
-                                    The bit width MUST be valid for the
-                                    IP version and the IP number MUST
-                                    NOT have bits set beyond the mask.
-
-                         The sense of the match can be inverted by
-                         preceding an address with the not modifier,
-                         causing all other addresses to be matched
-                         instead.  This does not affect the selection of
-                         port numbers.
-
-                            The keyword "any" is 0.0.0.0/0 or the IPv6
-                            equivalent.  The keyword "assigned" is the
-                            address or set of addresses assigned to the
-                            terminal.  The first rule SHOULD be "deny in
-                            ip !assigned".
-
-                         With the TCP, UDP and SCTP protocols, optional
-                         ports may be specified as:
-
-                            {port|port-port}[,port[,...]]
-
-                         The `-' notation specifies a range of ports
-                         (including boundaries).
-
-                         Fragmented packets which have a non-zero offset
-                         (i.e. not the first fragment) will never match
-                         a rule which has one or more port
-                         specifications.  See the frag option for
-                         details on matching fragmented packets.
-
-            options:
-               frag    Match if the packet is a fragment and this is not
-                       the first fragment of the datagram.  frag may not
-                       be used in conjunction with either tcpflags or
-                       TCP/UDP port specifications.
-
-               ipoptions spec
-                       Match if the IP header contains the comma
-                       separated list of options specified in spec. The
-                       supported IP options are:
-
-                       ssrr (strict source route), lsrr (loose source
-                       route), rr (record packet route) and ts
-                       (timestamp). The absence of a particular option
-                       may be denoted with a `!'.
-
-               tcpoptions spec
-                       Match if the TCP header contains the comma
-                       separated list of options specified in spec. The
-                       supported TCP options are:
-
-                       mss (maximum segment size), window (tcp window
-                       advertisement), sack (selective ack), ts (rfc1323
-                       timestamp) and cc (rfc1644 t/tcp connection
-                       count).  The absence of a particular option may
-                       be denoted with a `!'.
-
-               established
-                       TCP packets only. Match packets that have the RST
-                       or ACK bits set.
-
-               setup   TCP packets only. Match packets that have the SYN
-                       bit set but no ACK bit.
-
-               tcpflags spec
-                       TCP packets only. Match if the TCP header
-                       contains the comma separated list of flags
-                       specified in spec. The supported TCP flags are:
-
-                       fin, syn, rst, psh, ack and urg. The absence of a
-                       particular flag may be denoted with a `!'. A rule
-                       which contains a tcpflags specification can never
-                       match a fragmented packet which has a non-zero
-                       offset.  See the frag option for details on
-                       matching fragmented packets.
-
-               icmptypes types
-                       ICMP packets only.  Match if the ICMP type is in
-                       the list types. The list may be specified as any
-                       combination of ranges or individual types
-                       separated by commas.  The supported ICMP types
-                       are:
-
-                       echo reply (0), destination unreachable (3),
-                       source quench (4), redirect (5), echo request
-                       (8), router advertisement (9), router
-                       solicitation (10), time-to-live exceeded (11), IP
-                       header bad (12), timestamp request (13),
-                       timestamp reply (14), information request (15),
-                       information reply (16), address mask request (17)
-                       and address mask reply (18).
-
-         There is one kind of packet that the access device MUST always
-         discard, that is an IP fragment with a fragment offset of one.
-         This is a valid packet, but it only has one use, to try to
-         circumvent firewalls.
-
-            An access device that is unable to interpret or apply a deny
-            rule MUST terminate the session.  An access device that is
-            unable to interpret or apply a permit rule MAY apply a more
-            restrictive rule.  An access device MAY apply deny rules of
-            its own before the supplied rules, for example to protect
-            the access device owner's infrastructure.
-
-         The rule syntax is a modified subset of ipfw(8) from FreeBSD,
-         and the ipfw.c code may provide a useful base for
-         implementations.
-        -->
+                       The IPFilterRule format is derived from the OctetString AVP
+                       Base Format.  It uses the UTF-8 encoding and has the same
+                       requirements as the UTF8String. Packets may be filtered based
+                       on the following information that is associated with it:
+
+                          Direction                          (in or out)
+                          Source and destination IP address  (possibly masked)
+                          Protocol
+                          Source and destination port        (lists or ranges)
+                          TCP flags
+                          IP fragment flag
+                          IP options
+                          ICMP types
+
+                       Rules for the appropriate direction are evaluated in order,
+                       with the first matched rule terminating the evaluation.  Each
+                       packet is evaluated once. If no rule matches, the packet is
+                       dropped if the last rule evaluated was a permit, and passed if
+                       the last rule was a deny.
+
+                       IPFilterRule filters MUST follow the format:
+
+                          action dir proto from src to dst [options]
+
+                          action       permit - Allow packets that match the rule.
+                                       deny   - Drop packets that match the rule.
+
+                          dir          "in" is from the terminal, "out" is to the
+                                       terminal.
+
+                          proto        An IP protocol specified by number.  The "ip"
+                                       keyword means any protocol will match.
+
+                          src and dst  <address/mask> [ports]
+
+                                       The <address/mask> may be specified as:
+                                       ipno       An IPv4 or IPv6 number in dotted-
+                                                  quad or canonical IPv6 form. Only
+                                                  this exact IP number will match the
+                                                  rule.
+                                       ipno/bits  An IP number as above with a mask
+                                                  width of the form 1.2.3.4/24.  In
+                                                  this case all IP numbers from
+                                                  1.2.3.0 to 1.2.3.255 will match.
+                                                  The bit width MUST be valid for the
+                                                  IP version and the IP number MUST
+                                                  NOT have bits set beyond the mask.
+
+                                       The sense of the match can be inverted by
+                                       preceding an address with the not modifier,
+                                       causing all other addresses to be matched
+                                       instead.  This does not affect the selection of
+                                       port numbers.
+
+                                          The keyword "any" is 0.0.0.0/0 or the IPv6
+                                          equivalent.  The keyword "assigned" is the
+                                          address or set of addresses assigned to the
+                                          terminal.  The first rule SHOULD be "deny in
+                                          ip !assigned".
+
+                                       With the TCP, UDP and SCTP protocols, optional
+                                       ports may be specified as:
+
+                                          {port|port-port}[,port[,...]]
+
+                                       The `-' notation specifies a range of ports
+                                       (including boundaries).
+
+                                       Fragmented packets which have a non-zero offset
+                                       (i.e. not the first fragment) will never match
+                                       a rule which has one or more port
+                                       specifications.  See the frag option for
+                                       details on matching fragmented packets.
+
+                          options:
+                             frag    Match if the packet is a fragment and this is not
+                                     the first fragment of the datagram.  frag may not
+                                     be used in conjunction with either tcpflags or
+                                     TCP/UDP port specifications.
+
+                             ipoptions spec
+                                     Match if the IP header contains the comma
+                                     separated list of options specified in spec. The
+                                     supported IP options are:
+
+                                     ssrr (strict source route), lsrr (loose source
+                                     route), rr (record packet route) and ts
+                                     (timestamp). The absence of a particular option
+                                     may be denoted with a `!'.
+
+                             tcpoptions spec
+                                     Match if the TCP header contains the comma
+                                     separated list of options specified in spec. The
+                                     supported TCP options are:
+
+                                     mss (maximum segment size), window (tcp window
+                                     advertisement), sack (selective ack), ts (rfc1323
+                                     timestamp) and cc (rfc1644 t/tcp connection
+                                     count).  The absence of a particular option may
+                                     be denoted with a `!'.
+
+                             established
+                                     TCP packets only. Match packets that have the RST
+                                     or ACK bits set.
+
+                             setup   TCP packets only. Match packets that have the SYN
+                                     bit set but no ACK bit.
+
+                             tcpflags spec
+                                     TCP packets only. Match if the TCP header
+                                     contains the comma separated list of flags
+                                     specified in spec. The supported TCP flags are:
+
+                                     fin, syn, rst, psh, ack and urg. The absence of a
+                                     particular flag may be denoted with a `!'. A rule
+                                     which contains a tcpflags specification can never
+                                     match a fragmented packet which has a non-zero
+                                     offset.  See the frag option for details on
+                                     matching fragmented packets.
+
+                             icmptypes types
+                                     ICMP packets only.  Match if the ICMP type is in
+                                     the list types. The list may be specified as any
+                                     combination of ranges or individual types
+                                     separated by commas.  The supported ICMP types
+                                     are:
+
+                                     echo reply (0), destination unreachable (3),
+                                     source quench (4), redirect (5), echo request
+                                     (8), router advertisement (9), router
+                                     solicitation (10), time-to-live exceeded (11), IP
+                                     header bad (12), timestamp request (13),
+                                     timestamp reply (14), information request (15),
+                                     information reply (16), address mask request (17)
+                                     and address mask reply (18).
+
+                       There is one kind of packet that the access device MUST always
+                       discard, that is an IP fragment with a fragment offset of one.
+                       This is a valid packet, but it only has one use, to try to
+                       circumvent firewalls.
+
+                          An access device that is unable to interpret or apply a deny
+                          rule MUST terminate the session.  An access device that is
+                          unable to interpret or apply a permit rule MAY apply a more
+                          restrictive rule.  An access device MAY apply deny rules of
+                          its own before the supplied rules, for example to protect
+                          the access device owner's infrastructure.
+
+                       The rule syntax is a modified subset of ipfw(8) from FreeBSD,
+                       and the ipfw.c code may provide a useful base for
+                       implementations.
+               -->
                <typedefn type-name="QOSFilterRule" type-parent="OctetString"/>
                <!--
-         The QosFilterRule format is derived from the OctetString AVP
-         Base Format.  It uses the UTF-8 encoding and has the same
-         requirements as the UTF8String. Packets may be marked or
-         metered based on the following information that is associated
-         with it:
-
-            Direction                          (in or out)
-            Source and destination IP address  (possibly masked)
-            Protocol
-            Source and destination port        (lists or ranges)
-            DSCP values                        (no mask or range)
-
-         Rules for the appropriate direction are evaluated in order,
-         with the first matched rule terminating the evaluation.  Each
-         packet is evaluated once. If no rule matches, the packet is
-         treated as best effort.
-
-         QoSFilterRule filters MUST follow the format:
-
-            action dir proto from src to dst [options]
-
-                         tag    - Mark packet with a specific DSCP [49].
-                                  The DSCP option MUST be included.
-
-                         meter  - Meter traffic. The metering options
-                                  MUST be included.
-
-            dir          "in" is from the terminal, "out" is to the
-                         terminal.
-
-            proto        An IP protocol specified by number.  The "ip"
-                         keyword means any protocol will match.
-
-            src and dst  <address/mask> [ports]
-
-                         The <address/mask> may be specified as:
-                         ipno       An IPv4 or IPv6 number in dotted-
-                                    quad or canonical IPv6 form. Only
-                                    this exact IP number will match the
-                                    rule.
-                         ipno/bits  An IP number as above with a mask
-                                    width of the form 1.2.3.4/24.  In
-                                    this case all IP numbers from
-                                    1.2.3.0 to 1.2.3.255 will match.
-                                    The bit width MUST be valid for the
-                                    IP version and the IP number MUST
-                                    NOT have bits set beyond the mask.
-
-                         The sense of the match can be inverted by
-                         preceding an address with the not modifier,
-                         causing all other addresses to be matched
-                         instead.  This does not affect the selection of
-                         port numbers.
-
-                            The keyword "any" is 0.0.0.0/0 or the IPv6
-                            equivalent.  The keyword "assigned" is the
-                            address or set of addresses assigned to the
-                            terminal.  The first rule SHOULD be "deny in
-                            ip !assigned".
-
-                         With the TCP, UDP and SCTP protocols, optional
-                         ports may be specified as:
-
-                            {port|port-port}[,port[,...]]
-
-                         The `-' notation specifies a range of ports
-                         (including boundaries).
-
-            options:
-
-               DSCP <color>
-                       color values as defined in [49]. Exact matching
-                       of DSCP values is required (no masks or ranges).
-                       the "deny" can replace the color_under or
-                       color_over values in the meter action for rate-
-                       dependent packet drop.
-
-               metering <rate> <color_under> <color_over>
-                       The metering option provides Assured Forwarding,
-                       as defined in [50], and MUST be present if the
-                       action is set to meter. The rate option is the
-                       throughput, in bits per second, which is used by
-                       the access device to mark packets. Traffic above
-                       the rate is marked with the color_over codepoint,
-                       while traffic under the rate is marked with the
-                       color_under codepoint. The color_under and
-                       color_over options contain the drop preferences,
-                       and MUST conform to the recommended codepoint
-                       keywords described in [50] (e.g. AF13).
-
-                       The metering option also supports the strict
-                       limit on traffic required by Expedited
-                       Forwarding, as defined in [51]. The color_over
-                       option may contain the keyword "drop" to prevent
-                       forwarding of traffic that exceeds the rate
-                       parameter.
-
-         The rule syntax is a modified subset of ipfw(8) from FreeBSD,
-         and the ipfw.c code may provide a useful base for
-         implementations.
+                       The QosFilterRule format is derived from the OctetString AVP
+                       Base Format.  It uses the UTF-8 encoding and has the same
+                       requirements as the UTF8String. Packets may be marked or
+                       metered based on the following information that is associated
+                       with it:
 
-        -->
+                          Direction                          (in or out)
+                          Source and destination IP address  (possibly masked)
+                          Protocol
+                          Source and destination port        (lists or ranges)
+                          DSCP values                        (no mask or range)
+
+                       Rules for the appropriate direction are evaluated in order,
+                       with the first matched rule terminating the evaluation.  Each
+                       packet is evaluated once. If no rule matches, the packet is
+                       treated as best effort.
+
+                       QoSFilterRule filters MUST follow the format:
+
+                          action dir proto from src to dst [options]
+
+                                       tag    - Mark packet with a specific DSCP [49].
+                                                The DSCP option MUST be included.
+
+                                       meter  - Meter traffic. The metering options
+                                                MUST be included.
+
+                          dir          "in" is from the terminal, "out" is to the
+                                       terminal.
+
+                          proto        An IP protocol specified by number.  The "ip"
+                                       keyword means any protocol will match.
+
+                          src and dst  <address/mask> [ports]
+                       
+                                       The <address/mask> may be specified as:
+                                       ipno       An IPv4 or IPv6 number in dotted-
+                                                  quad or canonical IPv6 form. Only
+                                                  this exact IP number will match the
+                                                  rule.
+                                       ipno/bits  An IP number as above with a mask
+                                                  width of the form 1.2.3.4/24.  In
+                                                  this case all IP numbers from
+                                                  1.2.3.0 to 1.2.3.255 will match.
+                                                  The bit width MUST be valid for the
+                                                  IP version and the IP number MUST
+                                                  NOT have bits set beyond the mask.
+
+                                       The sense of the match can be inverted by
+                                       preceding an address with the not modifier,
+                                       causing all other addresses to be matched
+                                       instead.  This does not affect the selection of
+                                       port numbers.
+
+                                          The keyword "any" is 0.0.0.0/0 or the IPv6
+                                          equivalent.  The keyword "assigned" is the
+                                          address or set of addresses assigned to the
+                                          terminal.  The first rule SHOULD be "deny in
+                                          ip !assigned".
+
+                                       With the TCP, UDP and SCTP protocols, optional
+                                       ports may be specified as:
+
+                                          {port|port-port}[,port[,...]]
+
+                                       The `-' notation specifies a range of ports
+                                       (including boundaries).
+
+                          options:
+
+                             DSCP <color>
+                                     color values as defined in [49]. Exact matching
+                                     of DSCP values is required (no masks or ranges).
+                                     the "deny" can replace the color_under or
+                                     color_over values in the meter action for rate-
+                                     dependent packet drop.
+
+                             metering <rate> <color_under> <color_over>
+                                     The metering option provides Assured Forwarding,
+                                     as defined in [50], and MUST be present if the
+                                     action is set to meter. The rate option is the
+                                     throughput, in bits per second, which is used by
+                                     the access device to mark packets. Traffic above
+                                     the rate is marked with the color_over codepoint,
+                                     while traffic under the rate is marked with the
+                                     color_under codepoint. The color_under and
+                                     color_over options contain the drop preferences,
+                                     and MUST conform to the recommended codepoint
+                                     keywords described in [50] (e.g. AF13).
+
+                                     The metering option also supports the strict
+                                     limit on traffic required by Expedited
+                                     Forwarding, as defined in [51]. The color_over
+                                     option may contain the keyword "drop" to prevent
+                                     forwarding of traffic that exceeds the rate
+                                     parameter.
+
+                       The rule syntax is a modified subset of ipfw(8) from FreeBSD,
+                       and the ipfw.c code may provide a useful base for
+                       implementations.
+               -->
                <typedefn type-name="MIPRegistrationRequest" type-parent="OctetString"/>
                <typedefn type-name="Integer32"/>
                <!--
-         32 bit signed value, in network byte order. The AVP Length
-         field MUST be set to 12 (16 if the 'V' bit is enabled).
-       -->
+                       32 bit signed value, in network byte order. The AVP Length
+                       field MUST be set to 12 (16 if the 'V' bit is enabled).
+               -->
                <typedefn type-name="VendorId" type-parent="Unsigned32"/>
                <typedefn type-name="AppId" type-parent="Integer32"/>
                <typedefn type-name="Integer64"/>
                <!--
-         64 bit signed value, in network byte order. The AVP Length
-         field MUST be set to 16 (20 if the 'V' bit is enabled).
-        -->
+                       64 bit signed value, in network byte order. The AVP Length
+                       field MUST be set to 16 (20 if the 'V' bit is enabled).
+               -->
                <typedefn type-name="Unsigned32"/>
                <!--
-         32 bit unsigned value, in network byte order. The AVP Length
-         field MUST be set to 12 (16 if the 'V' bit is enabled).
-         Unsigned32 values used to transmit time data contains the four
-         most significant octets returned from NTP [18], in network byte
-         order.
-       -->
+                       32 bit unsigned value, in network byte order. The AVP Length
+                       field MUST be set to 12 (16 if the 'V' bit is enabled).
+                       Unsigned32 values used to transmit time data contains the four
+                       most significant octets returned from NTP [18], in network byte
+                       order.
+               -->
                <typedefn type-name="Time"/>
                <!--
-         The Time format is derived from the Unsigned32 AVP Base Format.
-         This is 32 bit unsigned value containing the four most
-         significant octets returned from NTP [18], in network byte
-         order.
+                       The Time format is derived from the Unsigned32 AVP Base Format.
+                       This is 32 bit unsigned value containing the four most
+                       significant octets returned from NTP [18], in network byte
+                       order.
 
-         This represent the number of seconds since 0h on 1 January 1900
-         with respect to the Coordinated Universal Time (UTC).
+                       This represent the number of seconds since 0h on 1 January 1900
+                       with respect to the Coordinated Universal Time (UTC).
 
-         On 6h 28m 16s UTC, 7 February 2036 the time value will
-         overflow.  NTP [18] describes a procedure to extend the time to
-         2104.
-        -->
+                       On 6h 28m 16s UTC, 7 February 2036 the time value will
+                       overflow.  NTP [18] describes a procedure to extend the time to
+                       2104.
+               -->
                <typedefn type-name="Unsigned64"/>
                <!--
-         64 bit unsigned value, in network byte order. The AVP Length
-         field MUST be set to 16 (20 if the 'V' bit is enabled).
-       -->
-               <typedefn type-name="Enumerated" type-parent="Unsigned32"/>
+                       64 bit unsigned value, in network byte order. The AVP Length
+                       field MUST be set to 16 (20 if the 'V' bit is enabled).
+               -->
+               <typedefn type-name="Enumerated" type-parent="Integer32"/>
                <typedefn type-name="DiameterURI" type-parent="UTF8String"/>
 
                <!-- ************************* End Typedefns ************************ -->
                <avp name="User-Name" code="1" mandatory="must">
                        <type type-name="UTF8String"/>
                </avp>
-               <avp name="User-Password" code="2" mandatory="may">
+               <avp name="User-Password" code="2" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
                        <type type-name="OctetString"/>
                </avp>
-               <avp name="CHAP-Password" code="3" mandatory="may">
+               <avp name="CHAP-Password" code="3" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
                        <type type-name="OctetString"/>
                </avp>
-               <avp name="NAS-IP-Address" code="4" mandatory="may">
+               <avp name="NAS-IP-Address" code="4" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
                        <type type-name="OctetString"/>
                </avp>
-               <avp name="NAS-Port" code="5" mandatory="may">
-                       <type type-name="Integer32"/>
-               </avp>
-               <avp name="Service-Type" code="6">
+               <avp name="NAS-Port" code="5" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
                        <type type-name="Unsigned32"/>
+               </avp>
+               <avp name="Service-Type" code="6" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+                       <type type-name="Enumerated"/>
+                       <enum name="Unknown" code="0"/>
                        <enum name="Login" code="1"/>
                        <enum name="Framed" code="2"/>
                        <enum name="Callback-Login" code="3"/>
                        <enum name="IAPP-Register" code="15"/>
                        <enum name="IAPP-AP-Check" code="16"/>
                        <enum name="Authorize Only" code="17"/>
+                       <enum name="Framed-Management" code="18"/>
                </avp>
-               <avp name="Framed-Protocol" code="7">
-                       <type type-name="Unsigned32"/>
-                       <enum name="ARA" code="3"/>
+               <avp name="Framed-Protocol" code="7" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+                       <type type-name="Enumerated"/>
+                       <enum name="PPP" code="1"/>
+                       <enum name="SLIP" code="2"/>
+                       <enum name="ARAP" code="3"/>
+                       <enum name="Gandalf" code="4"/>
+                       <enum name="Xylogics" code="5"/>
+                       <enum name="X.75" code="6"/>
+                       <enum name="GPRS PDP Context" code="7"/>
                        <enum name="Ascend-ARA" code="255"/>
-                       <enum name="COMB" code="260"/>
+                       <enum name="MPP" code="256"/>
                        <enum name="EURAW" code="257"/>
                        <enum name="EUUI" code="258"/>
-                       <enum name="FR" code="261"/>
-                       <enum name="Gandalf" code="4"/>
-                       <enum name="MPP" code="256"/>
-                       <enum name="PPP" code="1"/>
-                       <enum name="SLIP" code="2"/>
                        <enum name="X25" code="259"/>
-                       <enum name="Xylogics" code="5"/>
+                       <enum name="COMB" code="260"/>
+                       <enum name="FR" code="261"/>
                </avp>
-               <avp name="Framed-IP-Address" code="8" mandatory="may">
+               <avp name="Framed-IP-Address" code="8" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="mustnot">
                        <type type-name="IPAddress"/>
                </avp>
-               <avp name="Framed-IP-Netmask" code="9" mandatory="may">
+               <avp name="Framed-IP-Netmask" code="9" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="mustnot">
                        <type type-name="IPAddress"/>
                </avp>
-               <avp name="Framed-Routing" code="10">
-                       <type type-name="Unsigned32"/>
-                       <enum name="Broadcast" code="1"/>
-                       <enum name="Broadcast-Listen" code="3"/>
-                       <enum name="Listen" code="2"/>
+               <avp name="Framed-Routing" code="10" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="mustnot">
+                       <type type-name="Enumerated"/>
                        <enum name="None" code="0"/>
+                       <enum name="Send routing packets" code="1"/>
+                       <enum name="Listen for routing packets" code="2"/>
+                       <enum name="Send and Listen     " code="3"/>
                </avp>
-               <avp name="Filter-Id" code="11" mandatory="may">
-                       <type type-name="OctetString"/>
-               </avp>
-               <avp name="Framed-MTU" code="12" mandatory="may">
-                       <type type-name="Integer32"/>
+               <avp name="Filter-Id" code="11" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="mustnot">
+                       <type type-name="UTF8String"/>
                </avp>
-               <avp name="Framed-Compression" code="13">
+               <avp name="Framed-MTU" code="12" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="mustnot">
                        <type type-name="Unsigned32"/>
-                       <enum name="IPX-Header-Compression" code="2"/>
+               </avp>
+               <avp name="Framed-Compression" code="13" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="mustnot">
+                       <type type-name="Enumerated"/>
                        <enum name="None" code="0"/>
-                       <enum name="Van-Jacobson-TCP-IP" code="1"/>
+                       <enum name="Van Jacobson TCP/IP header compression" code="1"/>
+                       <enum name="IPX header compression" code="2"/>
+                       <enum name="Stac-LZS compression" code="3"/>
                </avp>
-               <avp name="Login-IP-Host" code="14" mandatory="may">
-                       <type type-name="IPAddress"/>
-               </avp>
-               <avp name="Login-Service" code="15">
-                       <type type-name="Unsigned32"/>
+               <avp name="Login-IP-Host" code="14" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="mustnot">
+                       <type type-name="IPAddress"/>
+               </avp>
+               <avp name="Login-Service" code="15" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="mustnot">
+                       <type type-name="Enumerated"/>
                        <enum name="Telnet" code="0"/>
                        <enum name="Rlogin" code="1"/>
                        <enum name="TCP-Clear" code="2"/>
                        <enum name="LAT" code="4"/>
                        <enum name="X25-PAD" code="5"/>
                        <enum name="X25-T3POS" code="6"/>
+                       <enum name="Unassigned" code="7"/>
                        <enum name="TCP Clear Quiet (suppresses any NAS-generated connect string)" code="8"/>
                </avp>
-               <avp name="Login-TCP-Port" code="16" mandatory="may">
-                       <type type-name="Integer32"/>
+               <avp name="Login-TCP-Port" code="16" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="mustnot">
+                       <type type-name="Unsigned32"/>
                </avp>
-               <avp name="Reply-Message" code="18" mandatory="may">
+               <!-- 17        Unassigned -->
+               <avp name="Unassigned" code="17" mandatory="may">
                        <type type-name="OctetString"/>
                </avp>
-               <avp name="Callback-Number" code="19" mandatory="may">
-                       <type type-name="OctetString"/>
+               <avp name="Reply-Message" code="18" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+                       <type type-name="UTF8String"/>
                </avp>
-               <avp name="Callback-Id" code="20" mandatory="may">
-                       <type type-name="OctetString"/>
+               <avp name="Callback-Number" code="19" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="Callback-Id" code="20" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+                       <type type-name="UTF8String"/>
                </avp>
-               <avp name="Framed-Route" code="22" mandatory="may">
+               <!-- 21        Unassigned -->
+               <avp name="Unassigned" code="21" mandatory="may">
                        <type type-name="OctetString"/>
                </avp>
-               <avp name="Framed-IPX-Network" code="23" mandatory="may">
-                       <type type-name="Integer32"/>
+               <avp name="Framed-Route" code="22" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="Framed-IPX-Network" code="23" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+                       <type type-name="UTF8String"/>
                </avp>
-               <avp name="State" code="24" mandatory="may">
+               <avp name="State" code="24" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
                        <type type-name="OctetString"/>
                </avp>
-               <avp name="Class" code="25" mandatory="must">
+               <avp name="Class" code="25" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
                        <type type-name="OctetString"/>
                </avp>
-               <avp name="Vendor-Specific" code="26">
+               <avp name="Vendor-Specific" code="26" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
                        <type type-name="Unsigned32"/>
                        <!-- Should vendors be enum'ed? -->
                </avp>
-               <avp name="Session-Timeout" code="27" mandatory="must">
+               <avp name="Session-Timeout" code="27" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
                        <type type-name="Unsigned32"/>
                </avp>
-               <avp name="Idle-Timeout" code="28" mandatory="may">
-                       <type type-name="Integer32"/>
+               <avp name="Idle-Timeout" code="28" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+                       <type type-name="Unsigned32"/>
                </avp>
-               <avp name="Termination-Action" code="29">
+               <avp name="Termination-Action" code="29" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
                        <type type-name="Unsigned32"/>
                        <enum name="Default" code="0"/>
                        <enum name="RADIUS-Request" code="1"/>
                </avp>
-               <avp name="Called-Station-Id" code="30" mandatory="may">
-                       <type type-name="OctetString"/>
+               <avp name="Called-Station-Id" code="30" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+                       <type type-name="UTF8String"/>
                </avp>
-               <avp name="Calling-Station-Id" code="31" mandatory="may">
-                       <type type-name="OctetString"/>
+               <avp name="Calling-Station-Id" code="31" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+                       <type type-name="UTF8String"/>
                </avp>
-               <avp name="NAS-Identifier" code="32" mandatory="may">
+               <avp name="NAS-Identifier" code="32" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
                        <type type-name="OctetString"/>
                </avp>
-               <avp name="Proxy-State" code="33" mandatory="must">
+               <avp name="Proxy-State" code="33" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
                        <type type-name="OctetString"/>
                </avp>
-               <avp name="Login-LAT-Service" code="34" mandatory="may">
+               <avp name="Login-LAT-Service" code="34" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
                        <type type-name="OctetString"/>
                </avp>
-               <avp name="Login-LAT-Node" code="35" mandatory="may">
+               <avp name="Login-LAT-Node" code="35" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
                        <type type-name="OctetString"/>
                </avp>
-               <avp name="Login-LAT-Group" code="36" mandatory="may">
+               <avp name="Login-LAT-Group" code="36" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
                        <type type-name="OctetString"/>
                </avp>
-               <avp name="Framed-AppleTalk-Link" code="37" mandatory="may">
-                       <type type-name="Integer32"/>
+               <avp name="Framed-AppleTalk-Link" code="37" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+                       <type type-name="Unsigned32"/>
                </avp>
-               <avp name="Framed-AppleTalk-Network" code="38" mandatory="may">
-                       <type type-name="Integer32"/>
+               <avp name="Framed-AppleTalk-Network" code="38" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+                       <type type-name="Unsigned32"/>
                </avp>
-               <avp name="Framed-AppleTalk-Zone" code="39" mandatory="may">
+               <avp name="Framed-AppleTalk-Zone" code="39" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
                        <type type-name="OctetString"/>
                </avp>
                <avp name="Acct-Status-Type" code="40">
                        <type type-name="Unsigned32"/>
-                       <enum name="Accounting-Off" code="8"/>
-                       <enum name="Accounting-On" code="7"/>
-                       <enum name="Alive" code="3"/>
-                       <enum name="Cancel" code="6"/>
-                       <enum name="Modem-Start" code="4"/>
-                       <enum name="Modem-Stop" code="5"/>
                        <enum name="Start" code="1"/>
                        <enum name="Stop" code="2"/>
-               </avp>
-               <avp name="Acct-Delay-Time" code="41" mandatory="may">
-                       <type type-name="Integer32"/>
+                       <enum name="Interim-Update" code="3"/>
+                       <enum name="Modem-Start" code="4"/>
+                       <enum name="Modem-Stop" code="5"/>
+                       <enum name="Cancel" code="6"/>
+                       <enum name="Accounting-On" code="7"/>
+                       <enum name="Accounting-Off" code="8"/>
+                       <!-- 9-14 Reserved for Tunnel Accounting -->
+                       <enum name="Tunnel-Start" code="9"/>
+                       <enum name="Tunnel-Stop" code="10"/>
+                       <enum name="Tunnel-Reject" code="11"/>
+                       <enum name="Tunnel-Link-Start" code="12"/>
+                       <enum name="Tunnel-Link-Stop" code="13"/>
+                       <enum name="Tunnel-Link-Rejectf" code="14"/>
+                       <!-- 15 Reserved for Tunnel Failed -->
+                       <enum name="Failed" code="15"/>
+               </avp>
+               <avp name="Acct-Delay-Time" code="41" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="mustnot">
+                       <type type-name="Unsigned32"/>
                </avp>
                <avp name="Acct-Input-Octets" code="42" mandatory="may">
-                       <type type-name="Integer32"/>
+                       <type type-name="Unsigned32"/>
                </avp>
                <avp name="Acct-Output-Octets" code="43" mandatory="may">
-                       <type type-name="Integer32"/>
-               </avp>
-               <avp name="Accounting-Session-Id" code="44" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="mustnot">
                        <type type-name="Unsigned32"/>
                </avp>
-               <avp name="Acct-Authentic" code="45">
-                       <type type-name="Unsigned32"/>
+               <avp name="Acct-Session-Id" code="44" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="mustnot">
+                       <type type-name="OctetString"/>
+                       <!-- See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5411 -->
+               </avp>
+               <avp name="Acct-Authentic" code="45" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="mustnot">
+                       <type type-name="Enumerated"/>
                        <enum name="None" code="0"/>
                        <enum name="RADIUS" code="1"/>
                        <enum name="Local" code="2"/>
                        <enum name="Remote" code="3"/>
                        <enum name="Diameter" code="4"/>
                </avp>
-               <avp name="Acct-Session-Time" code="46" mandatory="may">
-                       <type type-name="Integer32"/>
+               <avp name="Acct-Session-Time" code="46" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="mustnot">
+                       <type type-name="Unsigned32"/>
                </avp>
                <avp name="Acct-Input-Packets" code="47" mandatory="may">
                        <type type-name="Integer32"/>
                <avp name="Accounting-Multi-Session-Id" code="50" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="mustnot">
                        <type type-name="OctetString"/>
                </avp>
-               <avp name="Acct-Link-Count" code="51" mandatory="may">
-                       <type type-name="Integer32"/>
+               <avp name="Acct-Link-Count" code="51" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="mustnot">
+                       <type type-name="Unsigned32"/>
                </avp>
                <avp name="Acct-Input-Gigawords" code="52" mandatory="may">
                        <type type-name="Integer32"/>
                <avp name="Acct-Output-Gigawords" code="53" mandatory="may">
                        <type type-name="Integer32"/>
                </avp>
+<!-- 54        Unassigned -->
+               <avp name="Unassigned" code="54" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
                <avp name="Event-Timestamp" code="55" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot">
                        <type type-name="Time"/>
                </avp>
-<!--  56-59    (unassigned) -->
-               <avp name="CHAP-Challenge" code="60" mandatory="may">
+               <avp name="Egress-VLANID" code="56" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="mustnot">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Ingress-Filters" code="57" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="mustnot">
+                       <type type-name="Enumerated"/>
+                       <enum name="Enabled" code="1"/>
+                       <enum name="Disabled" code="2"/>
+               </avp>
+               <avp name="Egress-VLAN-Name" code="58" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="User-Priority-Table" code="59" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="mustnot">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="CHAP-Challenge" code="60" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
                        <type type-name="OctetString"/>
                </avp>
-               <avp name="NAS-Port-Type" code="61" mandatory="must" may-encrypt="yes">
+               <avp name="NAS-Port-Type" code="61" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
                        <type type-name="Enumerated"/>
                        <enum name="Async" code="0"/>
-                       <enum name="HDLC-Clear-Channel" code="7"/>
-                       <enum name="ISDN-Async-v110" code="4"/>
-                       <enum name="ISDN-Async-v120" code="3"/>
-                       <enum name="ISDN-Sync" code="2"/>
-                       <enum name="PIAFS" code="6"/>
                        <enum name="Sync" code="1"/>
+                       <enum name="ISDN-Sync" code="2"/>
+                       <enum name="ISDN-Async-v120" code="3"/>
+                       <enum name="ISDN-Async-v110" code="4"/>
                        <enum name="Virtual" code="5"/>
+                       <enum name="PIAFS" code="6"/>
+                       <enum name="HDLC-Clear-Channel" code="7"/>
                        <enum name="X25" code="8"/>
                        <enum name="X75" code="9"/>
                        <enum name="G.3 Fax" code="10"/>
                        <enum name="xDSL - Digital Subscriber Line of unknown type" code="16"/>
                        <enum name="Cable" code="17"/>
                        <enum name="Wireless - Other" code="18"/>
-                       <enum name="Wireless - IEEE 802.11  " code="19"/>
+                       <enum name="Wireless - IEEE 802.11" code="19"/>
                        <enum name="Token-Ring" code="20"/>
                        <enum name="FDDI" code="21"/>
                        <enum name="Wireless - CDMA2000" code="22"/>
                        <enum name="Wireless - 1X-EV" code="24"/>
                        <enum name="IAPP" code="25"/>
                        <enum name="FTTP - Fiber to the Premises" code="26"/>
+                       <enum name="Wireless - IEEE 802.16" code="27"/>
+                       <enum name="Wireless - IEEE 802.20" code="28"/>
+                       <enum name="Wireless - IEEE 802.22" code="29"/>
+                       <enum name="PPPoA - PPP over ATM" code="30"/>
+                       <enum name="PPPoEoA - PPP over Ethernet over ATM" code="31"/>
+                       <enum name="PPPoEoE - PPP over Ethernet over Ethernet" code="32"/>
+                       <enum name="PPPoEoVLAN - PPP over Ethernet over VLAN" code="33"/>
+                       <enum name="PPPoEoQinQ - PPP over Ethernet over IEEE 802.1QinQ" code="34"/>
+                       <enum name="xPON - Passive Optical Network" code="35"/>
+                       <enum name="Wireless - XGP" code="36"/>
+               </avp>
+               <avp name="Port-Limit" code="62" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+                       <type type-name="Unsigned32"/>
                </avp>
-               <avp name="Port-Limit" code="62" mandatory="may">
-                       <type type-name="Integer32"/>
-               </avp>
-               <avp name="Login-LAT-Port" code="63" mandatory="may">
+               <avp name="Login-LAT-Port" code="63" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
                        <type type-name="OctetString"/>
                </avp>
-               <avp name="Tunnel-Type" code="64">
-                       <type type-name="Unsigned32"/>
+               <avp name="Tunnel-Type" code="64" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+                       <type type-name="Enumerated"/>
                        <enum name="PPTP" code="1"/>
                        <enum name="L2F" code="2"/>
                        <enum name="L2TP" code="3"/>
                        <enum name="ESP" code="9"/>
                        <enum name="GRE" code="10"/>
                        <enum name="DVS" code="11"/>
-                       <enum name="IP-IP" code="12"/>
+                       <enum name="IP-in-IP Tunneling" code="12"/>
                        <enum name="VLAN" code="13"/>
                </avp>
-               <avp name="Tunnel-Medium-Type" code="65">
-                       <type type-name="Unsigned32"/>
+               <avp name="Tunnel-Medium-Type" code="65" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+                       <type type-name="Enumerated"/>
                        <enum name="IPv4" code="1"/>
                        <enum name="IPv6" code="2"/>
                        <enum name="NSAP" code="3"/>
                        <enum name="Vines" code="14"/>
                        <enum name="E-164-NSAP" code="15"/>
                </avp>
-               <avp name="Acct-Tunnel-Client-Endpoint" code="66" mandatory="may">
-                       <type type-name="OctetString"/>
+               <avp name="Acct-Tunnel-Client-Endpoint" code="66" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+                       <type type-name="UTF8String"/>
                </avp>
-               <avp name="Tunnel-Server-Endpoint" code="67" mandatory="may">
-                       <type type-name="OctetString"/>
+               <avp name="Tunnel-Server-Endpoint" code="67" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+                       <type type-name="UTF8String"/>
                </avp>
-               <avp name="Acct-Tunnel-Connection-ID" code="68" mandatory="may">
+               <avp name="Acct-Tunnel-Connection-ID" code="68" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
                        <type type-name="OctetString"/>
                </avp>
-               <avp name="Tunnel-Password" code="69" mandatory="may">
+               <avp name="Tunnel-Password" code="69" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
                        <type type-name="OctetString"/>
                </avp>
-               <avp name="ARAP-Password" code="70" mandatory="may">
+               <avp name="ARAP-Password" code="70" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
                        <type type-name="OctetString"/>
                </avp>
-               <avp name="ARAP-Features" code="71" mandatory="may">
+               <avp name="ARAP-Features" code="71" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
                        <type type-name="OctetString"/>
                </avp>
-               <avp name="ARAP-Zone-Access" code="72" mandatory="may">
-                       <type type-name="Integer32"/>
+               <avp name="ARAP-Zone-Access" code="72" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+                       <type type-name="Enumerated"/>
+                       <enum name="Only allow access to default zone" code="1"/>
+                       <enum name="Use zone filter inclusively" code="2"/>
+                       <enum name="Use zone filter exclusively" code="3"/>
                </avp>
-               <avp name="ARAP-Security" code="73" mandatory="may">
-                       <type type-name="Integer32"/>
+               <avp name="ARAP-Security" code="73" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+                       <type type-name="Unsigned32"/>
                </avp>
-               <avp name="ARAP-Security-Data" code="74" mandatory="may">
+               <avp name="ARAP-Security-Data" code="74" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
                        <type type-name="OctetString"/>
                </avp>
-               <avp name="Password-Retry" code="75" mandatory="may">
-                       <type type-name="Integer32"/>
+               <avp name="Password-Retry" code="75" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+                       <type type-name="Unsigned32"/>
                </avp>
-               <avp name="Prompt" code="76" mandatory="may">
-                       <type type-name="Integer32"/>
+               <avp name="Prompt" code="76" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+                       <type type-name="Enumerated"/>
+                       <enum name="No Echo" code="0"/>
+                       <enum name="Echo" code="1"/>
                </avp>
-               <avp name="Connect-Info" code="77" mandatory="may">
-                       <type type-name="OctetString"/>
+               <avp name="Connect-Info" code="77" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+                       <type type-name="UTF8String"/>
                </avp>
-               <avp name="Configuration-Token" code="78" mandatory="may">
+               <avp name="Configuration-Token" code="78" mandatory="must" protected="mustnot" vendor-bit="mustnot">
                        <type type-name="OctetString"/>
                </avp>
                <avp name="EAP-Message" code="79" mandatory="may">
                <avp name="Signature" code="80" mandatory="may">
                        <type type-name="OctetString"/>
                </avp>
-               <avp name="ARAP-Challenge-Response" code="84" mandatory="may">
+               <avp name="Tunnel-Private-Group-Id" code="81" mandatory="must" protected="mustnot" vendor-bit="mustnot">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Tunnel-Assignment-Id" code="82" mandatory="must" protected="mustnot" vendor-bit="mustnot">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Tunnel-Preference" code="83" mandatory="must" protected="mustnot" vendor-bit="mustnot">
+                       <type type-name="Unsigned32"/>
+               </avp>
+               <avp name="ARAP-Challenge-Response" code="84" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
                        <type type-name="OctetString"/>
                </avp>
                <avp name="Acct-Interim-Interval" code="85" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot">
-                       <type type-name="Integer32"/>
+                       <type type-name="Unsigned32"/>
+               </avp>
+               <avp name="Acct-Tunnel-Packets-Lost" code="86" mandatory="must" protected="mustnot" vendor-bit="mustnot">
+                       <type type-name="Unsigned32"/>
+               </avp>
+               <avp name="NAS-Port-Id" code="87" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="Framed-Pool" code="88" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="CUI" code="89" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="Tunnel-Client-Auth-Id" code="90" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="Tunnel-Server-Auth-Id" code="91" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="NAS-Filter-Rule" code="92" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+                       <type type-name="UTF8String"/>
                </avp>
-               <avp name="Framed-Interface-Id" code="96" mandatory="may">
+<!--  93       (unassigned) -->
+               <avp name="Unassigned" code="93" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Originating-Line-Info" code="94" mandatory="may" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="NAS-IPv6-Address" code="95" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Framed-Interface-Id" code="96" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
                        <type type-name="Unsigned64"/>
                </avp>
-               <avp name="Framed-IPv6-Prefix" code="97" mandatory="may">
+               <avp name="Framed-IPv6-Prefix" code="97" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Login-IPv6-Host" code="98" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Framed-IPv6-Route" code="99" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="Framed-IPv6-Prefix" code="100" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
                        <type type-name="OctetString"/>
                </avp>
-<!--
-http://www.iana.org/assignments/radius-types
-   98     Login-IPv6-Host                          [RFC3162]
-   99     Framed-IPv6-Route                        [RFC3162]
-  100     Framed-IPv6-Pool                         [RFC3162]
--->
                <avp name="Error-Cause" code="101" mandatory="may">
                        <type type-name="Integer32"/>
                        <enum name="Diameter Common Messages" code="0"/>
                        <enum name="Residual Session Context Removed" code="201"/>
                        <enum name="Invalid EAP Packet (Ignored)" code="202"/>
-                       <enum name="Unsupported Attribute"" code="401/>
+                       <enum name="Unsupported Attribute" code="401"/>
                        <enum name="Missing Attribute" code="402"/>
                        <enum name="NAS Identification Mismatch" code="403"/>
                        <enum name="Invalid Request" code="404"/>
                        <enum name="Unsupported Service" code="405"/>
                        <enum name="Unsupported Extension" code="406"/>
-                       <enum name="Invalid Attribute Value " code="407"/>              
+                       <enum name="Invalid Attribute Value" code="407"/>
                        <enum name="Administratively Prohibited" code="501"/>
                        <enum name="Request Not Routable (Proxy)" code="502"/>
                        <enum name="Session Context Not Found" code="503"/>
@@ -959,35 +1162,450 @@ http://www.iana.org/assignments/radius-types
                <avp name="SIP-AOR" code="122" mandatory="may">
                        <type type-name="UTF8String"/>
                </avp>
-<!--
-123     Delegated-IPv6-Prefix                    [RFC4818]
-124-191   (unassigned)
-192-223   Experimental Use                         [RFC3575]
-224-240   Implementation Specific                  [RFC3575]
-241-255   Reserved                                 [RFC3575]   
-
--->
-               <!-- ******************* DIAMETER BASE PROTOCOL AVPS ************************ -->
-               <avp name="Host-IP-Address" code="257" mandatory="must" protected="mustnot" may-encrypt="no" vendor-bit="mustnot">
-                       <type type-name="IPAddress"/>
+               <avp name="Delegated-IPv6-Prefix" code="123" mandatory="may">
+                       <type type-name="OctetString"/>
                </avp>
-               <avp name="Auth-Application-Id" code="258" mandatory="must" protected="mustnot" may-encrypt="no" vendor-bit="mustnot">
-                       <type type-name="AppId"/>
-                       <enum name="Diameter Common Messages" code="0"/>
-                       <enum name="Diameter NASREQ Application" code="1"/>
-                       <enum name="Diameter Mobile IPv4 Application" code="2"/>
-      <enum name="Diameter Base Accounting" code="3"/>
-      <enum name="Diameter Credit Control" code="4"/>
-      <enum name="Diameter EAP" code="5"/>
-      <enum name="Diameter Session Initiation Protocol (SIP) Application" code="6"/>
-      <enum name="3GPP CX/DX" code="16777216"/>
-                       <enum name="3GPP Sh" code="16777217"/>
-                       <enum name="3GPP Re/Rf" code="16777218"/>
-                       <enum name="3GPP Wx" code="16777219"/>
-                       <enum name="GPP Zn" code="16777220"/>
-                       <enum name="3GPP Zh" code="16777221"/>
-                       <enum name="3GPP Gq" code="16777222"/>
-                       <enum name="3GPP Gmb" code="16777223"/>
+               <avp name="MIP6-Feature-Vector" code="124" mandatory="may">
+                       <type type-name="Unsigned64"/>
+               </avp>
+               <avp name="MIP6-Home-Link-Prefix" code="125" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <!-- RFC5580 -->
+               <avp name="Operator-Name" code="126" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Location-Information" code="127" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Location-Data" code="128" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Basic-Location-Policy-Rules" code="129" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Extended-Location-Policy-Rules" code="130" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Location-Capable" code="131" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Requested-Location-Info" code="132" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Framed-Management-Protocol" code="133" mandatory="must" may-encrypt="no" protected="may" vendor-bit="mustnot">
+                       <type type-name="Enumerated"/>
+                       <enum name="SNMP" code="1"/>
+                       <enum name="Web-based" code="2"/>
+                       <enum name="NETCONF" code="3"/>
+                       <enum name="FTP" code="4"/>
+                       <enum name="TFTP" code="5"/>
+                       <enum name="SFTP" code="6"/>
+                       <enum name="RCP" code="7"/>
+                       <enum name="SCP" code="8"/>
+               </avp>
+               <avp name="Management-Transport-Protection" code="134" mandatory="must" may-encrypt="no" protected="may" vendor-bit="mustnot">
+                       <type type-name="Enumerated"/>
+                       <enum name="No-Protection" code="1"/>
+                       <enum name="Integrity-Protection" code="2"/>
+                       <enum name="Integrity-Confidentiality-Protection" code="3"/>
+               </avp>
+               <avp name="Management-Policy-Id" code="135" mandatory="may">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="Management-Privilege-Level" code="136" mandatory="must" may-encrypt="no" vendor-bit="mustnot">
+                       <type type-name="Integer32"/>
+               </avp>
+               <avp name="PKM-SS-Cert" code="137" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="PKM-CA-Cert" code="138" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="PKM-Config-Settings" code="139" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="PKM-Cryptosuite-List" code="140" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="PPKM-SAID" code="141" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="PKM-SA-Descriptor" code="142" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="PKM-Auth-Key" code="143" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <!-- 144-191   Unassigned -->
+               <avp name="Unassigned" code="144" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="145" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="146" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="147" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="148" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="149" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="150" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="151" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="152" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="153" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="154" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="155" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="156" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="157" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="158" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="159" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="160" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="161" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="162" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="163" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="164" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="165" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="166" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="167" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="168" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="169" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="170" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="171" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="172" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="173" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="174" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="175" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="176" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="177" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="178" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="179" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="180" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="181" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="182" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="183" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="184" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="185" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="186" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="187" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="188" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="189" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="190" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="191" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+
+               <!-- 192-223   Experimental Use                         [RFC3575] -->
+               <avp name="Experimental-Use" code="192" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Experimental-Use" code="193" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Experimental-Use" code="194" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Experimental-Use" code="195" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Experimental-Use" code="196" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Experimental-Use" code="197" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Experimental-Use" code="198" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Experimental-Use" code="199" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Experimental-Use" code="200" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Experimental-Use" code="201" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Experimental-Use" code="202" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Experimental-Use" code="203" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Experimental-Use" code="204" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Experimental-Use" code="205" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Experimental-Use" code="206" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Experimental-Use" code="207" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Experimental-Use" code="208" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Experimental-Use" code="209" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Experimental-Use" code="210" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Experimental-Use" code="211" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Experimental-Use" code="212" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Experimental-Use" code="213" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Experimental-Use" code="214" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Experimental-Use" code="215" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Experimental-Use" code="216" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Experimental-Use" code="217" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Experimental-Use" code="218" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Experimental-Use" code="219" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Experimental-Use" code="220" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Experimental-Use" code="221" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Experimental-Use" code="222" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Experimental-Use" code="223" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <!-- 224-240   Implementation Specific                  [RFC3575] -->
+               <avp name="Implementation-Specific" code="224" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Implementation-Specific" code="225" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Implementation-Specific" code="226" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Implementation-Specific" code="227" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Implementation-Specific" code="228" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Implementation-Specific" code="229" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Implementation-Specific" code="230" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Implementation-Specific" code="231" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Implementation-Specific" code="232" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Implementation-Specific" code="233" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Implementation-Specific" code="234" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Implementation-Specific" code="235" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Implementation-Specific" code="236" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Implementation-Specific" code="237" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Implementation-Specific" code="238" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Implementation-Specific" code="239" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Implementation-Specific" code="240" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <!--241-255   Reserved                                 [RFC3575] -->
+               <avp name="Reserved" code="241" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved" code="242" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved" code="243" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved" code="244" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved" code="245" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved" code="246" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved" code="247" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved" code="248" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved" code="249" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved" code="250" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved" code="251" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved" code="252" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved" code="253" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved" code="254" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved" code="255" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <!-- ******************* DIAMETER BASE PROTOCOL AVPS ************************ -->
+               <avp name="Unassigned" code="256" mandatory="may">
+                 <type type-name="OctetString"/>
+               </avp>
+               <avp name="Host-IP-Address" code="257" mandatory="must" protected="may" may-encrypt="no" vendor-bit="mustnot">
+                       <type type-name="IPAddress"/>
+               </avp>
+               <avp name="Auth-Application-Id" code="258" mandatory="must" protected="mustnot" may-encrypt="no" vendor-bit="mustnot">
+                       <type type-name="AppId"/>
+                       <enum name="Diameter Common Messages" code="0"/>
+                       <enum name="Diameter NASREQ Application" code="1"/>
+                       <enum name="Diameter Mobile IPv4 Application" code="2"/>
+                       <enum name="Diameter Base Accounting" code="3"/>
+                       <enum name="Diameter Credit Control" code="4"/>
+                       <enum name="Diameter EAP" code="5"/>
+                       <enum name="Diameter Session Initiation Protocol (SIP) Application" code="6"/>
+                       <enum name="Diameter Mobile IPv6 IKE   (MIP6I)" code="7"/>
+                       <enum name="Diameter Mobile IPv6 Auth  (MIP6A)" code="8"/>
+                       <enum name="Diameter QoS application" code="9"/>
+                       <!-- 10-16777215 Unassigned -->
+                       <enum name="3GPP CX/DX" code="16777216"/>
+                       <enum name="3GPP Sh" code="16777217"/>
+                       <enum name="3GPP Re/Rf" code="16777218"/>
+                       <enum name="3GPP Wx" code="16777219"/>
+                       <enum name="GPP Zn" code="16777220"/>
+                       <enum name="3GPP Zh" code="16777221"/>
+                       <enum name="3GPP Gq" code="16777222"/>
+                       <enum name="3GPP Gmb" code="16777223"/>
                        <enum name="3GPP Gx" code="16777224"/>
                        <enum name="3GPP Gx over Gy" code="16777225"/>
                        <enum name="3GPP MM10" code="16777226"/>
@@ -1006,2496 +1624,4118 @@ http://www.iana.org/assignments/radius-types
                        <enum name="Juniper Cluster" code="16777239"/>
                        <enum name="Juniper Policy-Control-AAA" code="16777240"/>
                        <enum name="iptego USPI" code="16777241"/>
-                       <enum name="Covergence-specific SIP routing" code="16777242"/>   
-                       <enum name="Policy Processing" code="16777243"/>   
-                       <enum name="Juniper Policy-Control-JSRC" code="16777244"/>   
+                       <enum name="Covergence-specific SIP routing" code="16777242"/>
+                       <enum name="Policy Processing" code="16777243"/>
+                       <enum name="Juniper Policy-Control-JSRC" code="16777244"/>
                        <enum name="ITU-T S-TC1" code="16777245"/>                                              <!-- ITU-T Rec. Q.3221 -->
-      <enum name="NSN Unified Charging Trigger Function (UCTF)" code="16777246"/>
-      <enum name="3GPP2 CAN Access Authentication and Authorization" code="16777247"/>
-      <enum name="3GPP2 WLAN Interworking Access Authentication and Authorization" code="16777248"/>
-      <enum name="3GPP2 WLAN Interworking Accounting" code="16777249"/>
-      <enum name="3GPP STaMIP" code="16777250"/>
-      <enum name="3GPP S6a" code="16777251"/>
-      <enum name="3GPP S13" code="16777252"/>
+                       <enum name="NSN Unified Charging Trigger Function (UCTF)" code="16777246"/>
+                       <enum name="3GPP2 CAN Access Authentication and Authorization" code="16777247"/>
+                       <enum name="3GPP2 WLAN Interworking Access Authentication and Authorization" code="16777248"/>
+                       <enum name="3GPP2 WLAN Interworking Accounting" code="16777249"/>
+                       <enum name="3GPP STaMIP" code="16777250"/>
+                       <enum name="3GPP S6a" code="16777251"/>
+                       <enum name="3GPP S13" code="16777252"/>
+                       <enum name="ETSI Re" code="16777253"/>
+                       <enum name="ETSI GOCAP" code="16777254"/>
+                       <enum name="SLg" code="16777255"/>
+                       <enum name="ITU-T Rw" code="16777256"/>
+                       <enum name="ETSI a4" code="16777257"/>
+                       <enum name="ITU-T Rt" code="16777258"/>
+                       <enum name="CARA" code="16777259"/>
+                       <enum name="CAMA" code="16777260"/>
+                       <enum name="Femtocell extension to Diameter EAP Application" code="16777261"/>
+                       <enum name="ITU-T Ru" code="16777262"/>
+                       <enum name="ITU-T Ng" code="16777263"/>
+                       <enum name="3GPP SWm" code="16777264"/>
+                       <enum name="3GPP SWx" code="16777265"/>
+                       <enum name="3GPP Gxx" code="16777266"/>
+                       <enum name="3GPP S9" code="16777267"/>
+                       <enum name="3GPP Zpn" code="16777268"/>
+                       <enum name="Ericsson HSI" code="16777269"/>
+                       <enum name="Juniper-Example" code="16777270"/>
+                       <enum name="ITU-T Ri" code="16777271"/>
+                       <enum name="3GPP S6b" code="16777272"/>
+      <!--
+16777273 Juniper JGx [Claudio_Lordello] 
+16777274 ITU-T Rd [ITU-T Rec. Q.3306.1][Janusz_Pieczerak] 
+16777275 ADMI Notification Application [Tomas_Menzl] 
+16777276 ADMI Messaging Interface Application [Tomas_Menzl] 
+16777277 Peter-Service VSI [Alexey_Grishin] 
+16777278 ETSI Rr request model [ETSI TS 183 071][Miguel_Angel_Reina_Ortega] 
+16777279 ETSI Rr delegated model [ETSI TS 183 071][Miguel_Angel_Reina_Ortega] 
+16777280 WIMAX HRPD Interworking [3GPP2 X.S0058-0 v1.0][Avi_Lior] 
+16777281 WiMAX Network Access Authentication and Authorization Diameter Application (WNAAADA) [WiMAX Release 1.5][Avi_Lior] 
+16777282 WiMAX Network Accounting Diameter Application (WNADA) [WiMAX Release 1.5][Avi_Lior] 
+16777283 WiMAX MIP4 Diameter Application (WM4DA) [WiMAX Release 1.5][Avi_Lior] 
+16777284 WiMAX MIP6 Diameter Application (WM6DA) [WiMAX Release 1.5][Avi_Lior] 
+16777285 WiMAX DHCP Diameter Application (WDDA) [WiMAX Release 1.5][Avi_Lior] 
+16777286 WiMAX-Location-Authentication-Authorization Diameter Application (WLAADA) [WiMAX Release 1.5][Avi_Lior] 
+16777287 WiMAX-Policy-and-Charging-Control-R3-Policies Diameter Application (WiMAX PCC-R3-P) [WiMAX Release 1.5][Avi_Lior] 
+16777288 WiMAX-Policy-and-Charging-Control-R3-OFfline-Charging Diameter Application (WiMAX PCC-R3-OFC) [WiMAX Release 1.5][Avi_Lior] 
+16777289 WiMAX-Policy-and-Charging-Control-R3-Offline-Charging-Prime Diameter Application (WiMAX PCC-R3-OFC-PRIME) [WiMAX Release 1.5][Avi_Lior] 
+16777290 WiMAX-Policy-and-Charging-Control-R3-Online-Charging Diameter Application (WiMAX PCC-R3-OC) [WiMAX Release 1.5][Avi_Lior] 
+16777291 3GPP SLh [3GPP TS 29.173][Kimmo_Kymalainen] 
+16777292 3GPP SGmb [3GPP TS 29.061][Kimmo_Kymalainen] 
+16777293 CMDI - Cloudmark Diameter Interface [Sanjiv_Parikh] 
+16777294 Camiant DRMA [Tarek_Abou-Assali][Michael_Mercurio] 
+16777295 PiLTE Interworking Diameter Application [3GPP2 publication X.S0057][Avi_Lior] 
+16777296 Juniper-Sessions-Recovery (JSR) [Aleksey_Romanov] 
+16777297 Vedicis LiveProxy [Francois-Frederic_Ozog] 
+16777298 Pi*3GPP2 Diameter Application [3GPP2 publication X.S0057A E-UTRAN eHRPD][Avi_Lior] 
+16777299 Sandvine Rf+ [Yoni_Eitan] 
+16777300 Subscription Information Application [Lars_Anglert] 
+16777301 Ericsson Charging-DCIP [Lars_Anglert] 
+-->
+      <enum name="3GPP Sy" code="16777302"/>
+      <enum name="3GPP Sd" code="16777303"/>
+      <enum name="Ericsson Sy" code="16777304"/>
+      <!--
+16777305 HP DTD [Chiranjeev_Agrawal][J_V_Kishore]       
+      -->
+                       <enum name="Relay" code="4294967295"/>
+               </avp>
+               <avp name="Acct-Application-Id" code="259" mandatory="must" protected="mustnot" may-encrypt="no" vendor-bit="mustnot">
+                       <type type-name="AppId"/>
+                       <enum name="Diameter Common Messages" code="0"/>
+                       <enum name="Diameter NASREQ Application" code="1"/>
+                       <enum name="Diameter Mobile IPv4 Application" code="2"/>
+                       <enum name="Diameter Base Accounting" code="3"/>
+                       <enum name="Diameter Credit Control" code="4"/>
+                       <enum name="Diameter EAP" code="5"/>
+                       <enum name="Diameter Session Initiation Protocol (SIP) Application" code="6"/>
+                       <enum name="Diameter Mobile IPv6 IKE   (MIP6I)" code="7"/>
+                       <enum name="Diameter Mobile IPv6 Auth  (MIP6A)" code="8"/>
+                       <enum name="3GPP CX/DX" code="16777216"/>
+                       <enum name="3GPP Sh" code="16777217"/>
+                       <enum name="3GPP Re/Rf" code="16777218"/>
+                       <enum name="3GPP Wx" code="16777219"/>
+                       <enum name="GPP Zn" code="16777220"/>
+                       <enum name="3GPP Zh" code="16777221"/>
+                       <enum name="3GPP Gq" code="16777222"/>
+                       <enum name="3GPP Gmb" code="16777223"/>
+                       <enum name="3GPP Gx" code="16777224"/>
+                       <enum name="3GPP Gx over Gy" code="16777225"/>
+                       <enum name="3GPP MM10" code="16777226"/>
+                       <enum name="Ericsson MSI" code="16777227"/>
+                       <enum name="Ericsson Zx" code="16777228"/>
+                       <enum name="3GPP Rx" code="16777229"/>
+                       <enum name="3GPP Pr" code="16777230"/>
+                       <enum name="ETSI e4" code="16777231"/>
+                       <enum name="Ericsson Charging-CIP" code="16777232"/>
+                       <enum name="Ericsson Mm" code="16777233"/>
+                       <enum name="Vodafone Gx+" code="16777234"/>
+                       <enum name="ITU-T Rs" code="16777235"/>
+                       <enum name="3GPP Rx" code="16777236"/>
+                       <enum name="3GPP2 Ty" code="16777237"/>
+                       <enum name="3GPP Gx" code="16777238"/>
+                       <enum name="Juniper Cluster" code="16777239"/>
+                       <enum name="Juniper Policy-Control-AAA" code="16777240"/>
+                       <enum name="iptego USPI" code="16777241"/>
+                       <enum name="Covergence-specific SIP routing" code="16777242"/>
+                       <enum name="Policy Processing" code="16777243"/>
+                       <enum name="Juniper Policy-Control-JSRC" code="16777244"/>
+                       <enum name="ITU-T S-TC1" code="16777245"/>              <!-- ITU-T Rec. Q.3221 -->
+                       <enum name="NSN Unified Charging Trigger Function (UCTF)" code="16777246"/>
+                       <enum name="3GPP2 CAN Access Authentication and Authorization" code="16777247"/>
+                       <enum name="3GPP2 WLAN Interworking Access Authentication and Authorization" code="16777248"/>
+                       <enum name="3GPP2 WLAN Interworking Accounting" code="16777249"/>
+                       <enum name="3GPP STaMIP" code="16777250"/>
+                       <enum name="3GPP S6a" code="16777251"/>
+                       <enum name="3GPP S13" code="16777252"/>
+                       <enum name="ETSI Re" code="16777253"/>
+                       <enum name="ETSI GOCAP" code="16777254"/>
+                       <enum name="SLg" code="16777255"/>
+                       <enum name="ITU-T Rw" code="16777256"/>
+                       <enum name="ETSI a4" code="16777257"/>
+                       <enum name="ITU-T Rt" code="16777258"/>
+                       <enum name="CARA" code="16777259"/>
+                       <enum name="CAMA" code="16777260"/>
+                       <enum name="Femtocell extension to Diameter EAP Application" code="16777261"/>
+                       <enum name="ITU-T Ru" code="16777262"/>
+                       <enum name="ITU-T Ng" code="16777263"/>
+                       <enum name="3GPP SWm" code="16777264"/>
+                       <enum name="3GPP SWx" code="16777265"/>
+                       <enum name="3GPP Gxx" code="16777266"/>
+                       <enum name="3GPP S9" code="16777267"/>
+                       <enum name="3GPP Zpn" code="16777268"/>
+                       <enum name="Ericsson HSI" code="16777269"/>
+                       <enum name="Juniper-Example" code="16777270"/>
+                       <enum name="ITU-T Ri" code="16777271"/>
+                       <enum name="3GPP S6b" code="16777272"/>
+      <!--
+16777273 Juniper JGx [Claudio_Lordello] 
+16777274 ITU-T Rd [ITU-T Rec. Q.3306.1][Janusz_Pieczerak] 
+16777275 ADMI Notification Application [Tomas_Menzl] 
+16777276 ADMI Messaging Interface Application [Tomas_Menzl] 
+16777277 Peter-Service VSI [Alexey_Grishin] 
+16777278 ETSI Rr request model [ETSI TS 183 071][Miguel_Angel_Reina_Ortega] 
+16777279 ETSI Rr delegated model [ETSI TS 183 071][Miguel_Angel_Reina_Ortega] 
+16777280 WIMAX HRPD Interworking [3GPP2 X.S0058-0 v1.0][Avi_Lior] 
+16777281 WiMAX Network Access Authentication and Authorization Diameter Application (WNAAADA) [WiMAX Release 1.5][Avi_Lior] 
+16777282 WiMAX Network Accounting Diameter Application (WNADA) [WiMAX Release 1.5][Avi_Lior] 
+16777283 WiMAX MIP4 Diameter Application (WM4DA) [WiMAX Release 1.5][Avi_Lior] 
+16777284 WiMAX MIP6 Diameter Application (WM6DA) [WiMAX Release 1.5][Avi_Lior] 
+16777285 WiMAX DHCP Diameter Application (WDDA) [WiMAX Release 1.5][Avi_Lior] 
+16777286 WiMAX-Location-Authentication-Authorization Diameter Application (WLAADA) [WiMAX Release 1.5][Avi_Lior] 
+16777287 WiMAX-Policy-and-Charging-Control-R3-Policies Diameter Application (WiMAX PCC-R3-P) [WiMAX Release 1.5][Avi_Lior] 
+16777288 WiMAX-Policy-and-Charging-Control-R3-OFfline-Charging Diameter Application (WiMAX PCC-R3-OFC) [WiMAX Release 1.5][Avi_Lior] 
+16777289 WiMAX-Policy-and-Charging-Control-R3-Offline-Charging-Prime Diameter Application (WiMAX PCC-R3-OFC-PRIME) [WiMAX Release 1.5][Avi_Lior] 
+16777290 WiMAX-Policy-and-Charging-Control-R3-Online-Charging Diameter Application (WiMAX PCC-R3-OC) [WiMAX Release 1.5][Avi_Lior] 
+16777291 3GPP SLh [3GPP TS 29.173][Kimmo_Kymalainen] 
+16777292 3GPP SGmb [3GPP TS 29.061][Kimmo_Kymalainen] 
+16777293 CMDI - Cloudmark Diameter Interface [Sanjiv_Parikh] 
+16777294 Camiant DRMA [Tarek_Abou-Assali][Michael_Mercurio] 
+16777295 PiLTE Interworking Diameter Application [3GPP2 publication X.S0057][Avi_Lior] 
+16777296 Juniper-Sessions-Recovery (JSR) [Aleksey_Romanov] 
+16777297 Vedicis LiveProxy [Francois-Frederic_Ozog] 
+16777298 Pi*3GPP2 Diameter Application [3GPP2 publication X.S0057A E-UTRAN eHRPD][Avi_Lior] 
+16777299 Sandvine Rf+ [Yoni_Eitan] 
+16777300 Subscription Information Application [Lars_Anglert] 
+16777301 Ericsson Charging-DCIP [Lars_Anglert] 
+-->
+      <enum name="3GPP Sy" code="16777302"/>
+      <enum name="3GPP Sd" code="16777303"/>
+      <enum name="Ericsson Sy" code="16777304"/>
+      <!--
+16777305 HP DTD [Chiranjeev_Agrawal][J_V_Kishore]       
+      -->
+
       <enum name="Relay" code="4294967295"/>
+                       </avp>
+               <avp name="Vendor-Specific-Application-Id" code="260" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot">
+                       <grouped>
+                               <gavp name="Vendor-Id"/>
+                               <gavp name="Auth-Application-Id"/>
+                               <gavp name="Acct-Application-Id"/>
+                       </grouped>
+               </avp>
+               <avp name="Redirect-Host-Usage" code="261" mandatory="must" may-encrypt="no" protected="may" vendor-bit="mustnot">
+                       <type type-name="Enumerated"/>
+                       <enum name="Don't Care" code="0"/>
+                       <enum name="All Session" code="1"/>
+                       <enum name="All Realm" code="2"/>
+                       <enum name="Realm and Application" code="3"/>
+                       <enum name="All Application" code="4"/>
+                       <enum name="All Host" code="5"/>
+                       <enum name="ALL_USER" code="6"/>
+               </avp>
+               <avp name="Redirect-Max-Cache-Time" code="262" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot">
+                       <type type-name="Unsigned32"/>
+               </avp>
+               <avp name="Session-Id" code="263" mandatory="must" protected="mustnot" vendor-bit="mustnot">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="Origin-Host" code="264" mandatory="must" may-encrypt="no" protected="may" vendor-bit="mustnot">
+                       <type type-name="DiameterIdentity"/>
+               </avp>
+               <avp name="Supported-Vendor-Id" code="265" mandatory="must" may-encrypt="no" protected="may" vendor-bit="mustnot">
+                       <type type-name="VendorId"/>
+               </avp>
+               <avp name="Vendor-Id" code="266" mandatory="must" may-encrypt="no" protected="may" vendor-bit="mustnot">
+                       <type type-name="VendorId"/>
+               </avp>
+               <avp name="Firmware-Revision" code="267" mandatory="mustnot" protected="mustnot" may-encrypt="no" vendor-bit="mustnot">
+                       <type type-name="Unsigned32"/>
+               </avp>
+               <avp name="Result-Code" code="268" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot">
+                       <type type-name="Unsigned32"/>
+                       <enum name="DIAMETER_MULTI_ROUND_AUTH" code="1001"/>
+                       <enum name="DIAMETER_SUCCESS" code="2001"/>
+                       <enum name="DIAMETER_LIMITED_SUCCESS" code="2002"/>
+                       <enum name="DIAMETER_FIRST_REGISTRATION" code="2003"/>
+                       <enum name="DIAMETER_SUBSEQUENT_REGISTRATION" code="2004"/>
+                       <enum name="DIAMETER_UNREGISTERED_SERVICE" code="2005"/>
+                       <enum name="DIAMETER_SUCCESS_SERVER_NAME_NOT_STORED" code="2006"/>
+                       <enum name="DIAMETER_SERVER_SELECTION" code="2007"/>
+                       <enum name="DIAMETER_SUCCESS_AUTH_SENT_SERVER_NOT_STORED" code="2008"/>
+                       <enum name="DIAMETER_SUCCESS_RELOCATE_HA" code="2009"/>
+                       <!-- 2010-2999 Unassigned -->
+                       <enum name="DIAMETER_COMMAND_UNSUPPORTED" code="3001"/>
+                       <enum name="DIAMETER_UNABLE_TO_DELIVER" code="3002"/>
+                       <enum name="DIAMETER_REALM_NOT_SERVED" code="3003"/>
+                       <enum name="DIAMETER_TOO_BUSY" code="3004"/>
+                       <enum name="DIAMETER_LOOP_DETECTED" code="3005"/>
+                       <enum name="DIAMETER_REDIRECT_INDICATION" code="3006"/>
+                       <enum name="DIAMETER_APPLICATION_UNSUPPORTED" code="3007"/>
+                       <enum name="DIAMETER_INVALID_HDR_BITS" code="3008"/>
+                       <enum name="DIAMETER_INVALID_AVP_BITS" code="3009"/>
+                       <enum name="DIAMETER_UNKNOWN_PEER" code="3010"/>
+                       <!-- 3011-3999 Unassigned -->
+                       <enum name="DIAMETER_AUTHENTICATION_REJECTED" code="4001"/>
+                       <enum name="DIAMETER_OUT_OF_SPACE" code="4002"/>
+                       <enum name="DIAMETER_ELECTION_LOST" code="4003"/>
+                       <enum name="DIAMETER_ERROR_MIP_REPLY_FAILURE" code="4005"/>
+                       <enum name="DIAMETER_ERROR_HA_NOT_AVAILABLE" code="4006"/>
+                       <enum name="DIAMETER_ERROR_BAD_KEY" code="4007"/>
+                       <enum name="DIAMETER_ERROR_MIP_FILTER_NOT_SUPPORTED" code="4008"/>
+                       <enum name="DIAMETER_END_USER_SERVICE_DENIED" code="4010"/>
+                       <enum name="DIAMETER_CREDIT_CONTROL_NOT_APPLICABLE" code="4011"/>
+                       <enum name="DIAMETER_CREDIT_LIMIT_REACHED" code="4012"/>
+                       <enum name="DIAMETER_USER_NAME_REQUIRED" code="4013"/>
+                       <!-- 4014-4999 Unassigned -->
+                       <enum name="DIAMETER_AVP_UNSUPPORTED" code="5001"/>
+                       <enum name="DIAMETER_UNKNOWN_SESSION_ID" code="5002"/>
+                       <enum name="DIAMETER_AUTHORIZATION_REJECTED" code="5003"/>
+                       <enum name="DIAMETER_INVALID_AVP_VALUE" code="5004"/>
+                       <enum name="DIAMETER_MISSING_AVP" code="5005"/>
+                       <enum name="DIAMETER_RESOURCES_EXCEEDED" code="5006"/>
+                       <enum name="DIAMETER_CONTRADICTING_AVPS" code="5007"/>
+                       <enum name="DIAMETER_AVP_NOT_ALLOWED" code="5008"/>
+                       <enum name="DIAMETER_AVP_OCCURS_TOO_MANY_TIMES" code="5009"/>
+                       <enum name="DIAMETER_NO_COMMON_APPLICATION" code="5010"/>
+                       <enum name="DIAMETER_UNSUPPORTED_VERSION" code="5011"/>
+                       <enum name="DIAMETER_UNABLE_TO_COMPLY" code="5012"/>
+                       <enum name="DIAMETER_INVALID_BIT_IN_HEADER" code="5013"/>
+                       <enum name="DIAMETER_INVALID_AVP_LENGTH" code="5014"/>
+                       <enum name="DIAMETER_INVALID_MESSAGE_LENGTH" code="5015"/>
+                       <enum name="DIAMETER_INVALID_AVP_BIT_COMBO" code="5016"/>
+                       <enum name="DIAMETER_NO_COMMON_SECURITY" code="5017"/>
+                       <enum name="DIAMETER_RADIUS_AVP_UNTRANSLATABLE" code="5018"/>
+                       <!-- 5019-5023 Unassigned -->
+                       <enum name="DIAMETER_ERROR_NO_FOREIGN_HA_SERVICE" code="5024"/>
+                       <enum name="DIAMETER_ERROR_END_TO_END_MIP_KEY_ENCRYPTION" code="5025"/>
+                       <!-- 5026-5029 Unassigned -->
+                       <enum name="DIAMETER_USER_UNKNOWN" code="5030"/>
+                       <enum name="DIAMETER_RATING_FAILED" code="5031"/>
+                       <enum name="DIAMETER_ERROR_USER_UNKNOWN" code="5032"/>
+                       <enum name="DIAMETER_ERROR_IDENTITIES_DONT_MATCH" code="5033"/>
+                       <enum name="DIAMETER_ERROR_IDENTITY_NOT_REGISTERED" code="5034"/>
+                       <enum name="DIAMETER_ERROR_ROAMING_NOT_ALLOWED" code="5035"/>
+                       <enum name="DIAMETER_ERROR_IDENTITY_ALREADY_REGISTERED" code="5036"/>
+                       <enum name="DIAMETER_ERROR_AUTH_SCHEME_NOT_SUPPORTED" code="5037"/>
+                       <enum name="DIAMETER_ERROR_IN_ASSIGNMENT_TYPE" code="5038"/>
+                       <enum name="DIAMETER_ERROR_TOO_MUCH_DATA" code="5039"/>
+                       <enum name="DIAMETER_ERROR_NOT SUPPORTED_USER_DATA" code="5040"/>
+                       <enum name="DIAMETER_ERROR_MIP6_AUTH_MODE" code="5041"/>
+                       <!-- 5042-4294967295 Unassigned -->
+               </avp>
+               <avp name="Product-Name" code="269" mandatory="mustnot" may-encrypt="no" protected="mustnot" vendor-bit="mustnot">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="Session-Binding" code="270" mandatory="must" protected="mustnot" vendor-bit="mustnot">
+                       <type type-name="Unsigned32"/>
+                       <enum name="RE_AUTH" code="1"/>
+                       <enum name="STR" code="2"/>
+                       <enum name="Unassigned" code="3"/>
+                       <enum name="ACCOUNTING" code="4"/>
+               </avp>
+               <avp name="Session-Server-Failover" code="271" mandatory="must" protected="mustnot" vendor-bit="mustnot">
+                       <type type-name="Unsigned32"/>
+                       <enum name="REFUSE_SERVICE" code="0"/>
+                       <enum name="TRY_AGAIN" code="1"/>
+                       <enum name="ALLOW_SERVICE" code="2"/>
+                       <enum name="TRY_AGAIN_ALLOW_SERVICE" code="3"/>
+               </avp>
+               <avp name="Multi-Round-Time-Out" code="272" mandatory="must" may-encrypt="yes" vendor-bit="mustnot">
+                       <type type-name="Unsigned32"/>
+               </avp>
+               <avp name="Disconnect-Cause" code="273" mandatory="must" protected="mustnot" may-encrypt="no" vendor-bit="mustnot">
+                       <type type-name="Enumerated"/>
+                       <enum name="REBOOTING" code="0"/>
+                       <enum name="BUSY" code="1"/>
+                       <enum name="DO_NOT_WANT_TO_TALK_TO_YOU" code="2"/>
+               </avp>
+               <avp name="Auth-Request-Type" code="274" mandatory="must" protected="mustnot" may-encrypt="no" vendor-bit="mustnot">
+                       <type type-name="Unsigned32"/>
+                       <enum name="Authenticate Only" code="1"/>
+                       <enum name="Authorize Only" code="2"/>
+                       <enum name="Authorize Authenticate" code="3"/>
+               </avp>
+               <avp name="Alternate-Peer" code="275" mandatory="must" protected="mustnot" may-encrypt="no" vendor-bit="mustnot">
+                       <type type-name="DiameterIdentity"/>
+               </avp>
+               <avp name="Auth-Grace-Period" code="276" mandatory="must" may-encrypt="no" vendor-bit="mustnot">
+                       <type type-name="Unsigned32"/>
+               </avp>
+               <avp name="Auth-Session-State" code="277" mandatory="must" may-encrypt="no" vendor-bit="mustnot">
+                       <type type-name="Unsigned32"/>
+                       <enum name="STATE_MAINTAINED" code="0"/>
+                       <enum name="NO_STATE_MAINTAINED" code="1"/>
+               </avp>
+               <avp name="Origin-State-Id" code="278" mandatory="must" protected="mustnot" vendor-bit="mustnot">
+                       <type type-name="Unsigned32"/>
+               </avp>
+               <avp name="Failed-AVP" code="279" mandatory="must" may-encrypt="no" vendor-bit="mustnot">
+                       <grouped>
+
+                       </grouped>
+               </avp>
+               <avp name="Proxy-Host" code="280" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot">
+                       <type type-name="DiameterIdentity"/>
+               </avp>
+               <avp name="Error-Message" code="281" mandatory="mustnot" protected="may" may-encrypt="no" vendor-bit="mustnot">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="Route-Record" code="282" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot">
+                       <type type-name="DiameterIdentity"/>
+               </avp>
+               <avp name="Destination-Realm" code="283" mandatory="must" protected="mustnot" may-encrypt="no" vendor-bit="mustnot">
+                       <type type-name="DiameterIdentity"/>
+               </avp>
+               <avp name="Proxy-Info" code="284" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot">
+                       <grouped>
+                               <gavp name="Proxy-Host"/>
+                               <gavp name="Proxy-State"/>
+                       </grouped>
+               </avp>
+               <avp name="Re-Auth-Request-Type" code="285" mandatory="must" may-encrypt="no" vendor-bit="mustnot">
+                       <type type-name="Unsigned32"/>
+                       <enum name="AUTHORIZE_ONLY" code="0"/>
+                       <enum name="AUTHORIZE_AUTHENTICATE" code="1"/>
+               </avp>
+<!-- 286 Unassigned -->
+               <avp name="Unassigned" code="286" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Accounting-Sub-Session-Id" code="287" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="mustnot">
+                       <type type-name="Unsigned64"/>
+               </avp>
+<!-- 288-290    Unallocated http://www.iana.org/assignments/aaa-parameters  -->
+               <avp name="Unallocated" code="288" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unallocated" code="289" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unallocated" code="290" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Authorization-Lifetime" code="291" mandatory="must" may-encrypt="no" vendor-bit="mustnot">
+                       <type type-name="Integer32"/>
+               </avp>
+               <avp name="Redirect-Host" code="292" mandatory="must" may-encrypt="no" protected="may" vendor-bit="mustnot">
+                       <type type-name="DiameterURI"/>
+               </avp>
+               <avp name="Destination-Host" code="293" mandatory="must" protected="mustnot" may-encrypt="no" vendor-bit="mustnot">
+                       <type type-name="DiameterIdentity"/>
+               </avp>
+               <avp name="Error-Reporting-Host" code="294" mandatory="mustnot" protected="may" may-encrypt="no" vendor-bit="mustnot">
+                       <type type-name="DiameterIdentity"/>
+               </avp>
+               <avp name="Termination-Cause" code="295" mandatory="must" may-encrypt="no" protected="may" vendor-bit="mustnot">
+                       <type type-name="Enumerated"/>
+                       <enum name="DIAMETER_LOGOUT" code="1"/>
+                       <enum name="DIAMETER_SERVICE_NOT_PROVIDED" code="2"/>
+                       <enum name="DIAMETER_BAD_ANSWER" code="3"/>
+                       <enum name="DIAMETER_ADMINISTRATIVE" code="4"/>
+                       <enum name="DIAMETER_LINK_BROKEN" code="5"/>
+                       <enum name="DIAMETER_AUTH_EXPIRED" code="6"/>
+                       <enum name="DIAMETER_USER_MOVED" code="7"/>
+                       <enum name="DIAMETER_SESSION_TIMEOUT" code="8"/>
+               </avp>
+               <avp name="Origin-Realm" code="296" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot">
+                       <type type-name="DiameterIdentity"/>
+               </avp>
+               <avp name="Experimental-Result" code="297" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot">
+                       <grouped>
+                               <gavp name="Vendor-Id"/>
+                               <gavp name="Experimental-Result-Code"/>
+                       </grouped>
+               </avp>
+               <!-- 3GPP TS 29.230 version 9.2.0 Release 9, ETSI TS 129 230 V9.2.0 (2010-04) -->
+               <avp name="Experimental-Result-Code" code="298" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot">
+                       <type type-name="Unsigned32"/>
+                       <enum name="DIAMETER_FIRST_REGISTRATION" code="2001"/>
+                       <enum name="DIAMETER_SUBSEQUENT_REGISTRATION" code="2002"/>
+                       <enum name="DIAMETER_UNREGISTERED_SERVICE" code="2003"/>
+                       <enum name="DIAMETER_SUCCESS_SERVER_NAME_NOT_STORED" code="2004"/>
+                       <enum name="DIAMETER_SERVER_SELECTION(Deprecated value)" code="2005"/>
+                       <enum name="DIAMETER_PDP_CONTEXT_DELETION_INDICATION" code="2021"/>
+                       <enum name="DIAMETER_USER_DATA_NOT_AVAILABLE" code="4100"/>
+                       <enum name="DIAMETER_PRIOR_UPDATE_IN_PROGRESS" code="4101"/>
+                       <enum name="DIAMETER_ERROR_OUT_OF_RESOURCES" code="4121"/>
+                       <enum name="DIAMETER_PCC_BEARER_EVENT" code="4141"/>
+                       <enum name="DIAMETER_AUTHENTICATION_DATA_UNAVAILABLE" code="4181"/>
+                       <enum name="DIAMETER_ERROR_ABSENT_USER" code="4201"/>
+                       <enum name="DIAMETER_ERROR_UNREACHABLE_USER" code="4221"/>
+                       <enum name="DIAMETER_ERROR_SUSPENDED_USER" code="4222"/>
+                       <enum name="DIAMETER_ERROR_DETACHED_USER" code="4223"/>
+                       <enum name="DIAMETER_ERROR_POSITIONING_DENIED" code="4224"/>
+                       <enum name="DIAMETER_ERROR_POSITIONING_FAILED" code="4225"/>
+                       <enum name="DIAMETER_ERROR_UNKNOWN_UNREACHABLE LCS_CLIENT" code="4226"/>
+                       <!-- 4227-5000 Unassigned -->
+                       <enum name="DIAMETER_ERROR_USER_UNKNOWN" code="5001"/>
+                       <enum name="DIAMETER_ERROR_IDENTITIES_DONT_MATCH" code="5002"/>
+                       <enum name="DIAMETER_ERROR_IDENTITY_NOT_REGISTERED" code="5003"/>
+                       <enum name="DIAMETER_ERROR_ROAMING_NOT_ALLOWED" code="5004"/>
+                       <enum name="DIAMETER_ERROR_IDENTITY_ALREADY_REGISTERED" code="5005"/>
+                       <enum name="DIAMETER_ERROR_AUTH_SCHEME_NOT_SUPPORTED" code="5006"/>
+                       <enum name="DIAMETER_ERROR_IN_ASSIGNMENT_TYPE" code="5007"/>
+                       <enum name="DIAMETER_ERROR_TOO_MUCH_DATA" code="5008"/>
+                       <enum name="DIAMETER_ERROR_NOT_SUPPORTED_USER_DATA" code="5009"/>
+                       <enum name="DIAMETER_MISSING_USER_ID" code="5010"/>
+                       <enum name="DIAMETER_ERROR_FEATURE_UNSUPPORTED" code="5011"/>
+                       <!-- 5012 - 5040 -->
+                       <enum name="DIAMETER_ERROR_USER_NO_WLAN_SUBSCRIPTION" code="5041"/>
+                       <enum name="DIAMETER_ERROR_W-APN_UNUSED_BY_USER" code="5042"/>
+                       <enum name="DIAMETER_ERROR_W-DIAMETER_ERROR_NO_ACCESS_INDEPENDENT_SUBSCRIPTION" code="5043"/>
+                       <enum name="DIAMETER_ERROR_USER_NO_W-APN_SUBSCRIPTION" code="5044"/>
+                       <enum name="DIAMETER_ERROR_UNSUITABLE_NETWORK" code="5045"/>
+                       <!-- 5046-5060 Unassigned -->
+                       <enum name="INVALID_SERVICE_INFORMATION" code="5061"/>
+                       <enum name="FILTER_RESTRICTIONS" code="5062"/>
+                       <enum name="REQUESTED_SERVICE_NOT_AUTHORIZED" code="5063"/>
+                       <enum name="DUPLICATED_AF_SESSION" code="5064"/>
+                       <enum name="IP-CAN_SESSION_NOT_AVAILABLE" code="5065"/>
+                       <enum name="UNAUTHORIZED_NON_EMERGENCY_SESSION" code="5066"/>
+                       <enum name="DIAMETER_ERROR_USER_DATA_NOT_RECOGNIZED" code="5100"/>
+                       <enum name="DIAMETER_ERROR_OPERATION_NOT_ALLOWED" code="5101"/>
+                       <enum name="DIAMETER_ERROR_USER_DATA_CANNOT_BE_READ" code="5102"/>
+                       <enum name="DIAMETER_ERROR_USER_DATA_CANNOT_BE_MODIFIED" code="5103"/>
+                       <enum name="DIAMETER_ERROR_USER_DATA_CANNOT_BE_NOTIFIED" code="5104"/>
+                       <enum name="DIAMETER_ERROR_TRANSPARENT_DATA_OUT_OF_SYNC" code="5105"/>
+                       <enum name="DIAMETER_ERROR_SUBS_DATA_ABSENT" code="5106"/>
+                       <enum name="DIAMETER_ERROR_NO_SUBSCRIPTION_TO_DATA" code="5107"/>
+                       <enum name="DIAMETER_ERROR_DSAI_NOT_AVAILABLE" code="5108"/>
+                       <!-- 5109-5119 Unassigned -->
+                       <enum name="DIAMETER_ERROR_START_INDICATION" code="5120"/>
+                       <enum name="DIAMETER_ERROR_STOP_INDICATION" code="5121"/>
+                       <enum name="DIAMETER_ERROR_UNKNOWN_MBMS_BEARER_SERVICE" code="5122"/>
+                       <enum name="DIAMETER_ERROR_SERVICE_AREA" code="5123"/>
+                       <enum name="DIAMETER_ERROR_INITIAL_PARAMETERS" code="5140"/>
+                       <enum name="DIAMETER_ERROR_TRIGGER_EVENT" code="5141"/>
+                       <enum name="DIAMETER_BEARER_EVENT" code="5142"/>
+                       <enum name="DIAMETER_ERROR_BEARER_NOT_AUTHORIZED" code="5143"/>
+                       <enum name="DIAMETER_ERROR_TRAFFIC_MAPPING_INFO_REJECTED" code="5144"/>
+                       <enum name="DIAMETER_QOS_RULE_EVENT" code="5145"/>
+                       <enum name="DIAMETER_ERROR_TRAFFIC_MAPPING_INFO_REJECTED" code="5146"/>
+                       <enum name="DIAMETER_ERROR_CONFLICTING_REQUEST" code="5147"/>
+                       <enum name="DIAMETER_ERROR_IMPI_UNKNOWN" code="5401"/>
+                       <enum name="DIAMETER_ERROR_NOT_AUTHORIZED" code="5402"/>
+                       <enum name="DIAMETER_ERROR_TRANSACTION_IDENTIFIER_INVALID" code="5403"/>
+                       <enum name="DIAMETER_ERROR_UNKNOWN_EPS_SUBSCRIPTION" code="5420"/>
+                       <enum name="DIAMETER_ERROR_RAT_NOT_ALLOWED" code="5421"/>
+                       <enum name="DIAMETER_ERROR_EQUIPMENT_UNKNOWN" code="5422"/>
+                       <enum name="DIAMETER_ERROR_UNKNOWN_SERVING_NODE" code="5423"/>
+                       <!-- 5424-5449 Unassigned -->
+                       <enum name="DIAMETER_ERROR_USER_NO_NON_3GPP_SUBSCRIPTION" code="5450"/>
+                       <enum name="DIAMETER_ERROR_USER_NO_APN_SUBSCRIPTION" code="5451"/>
+                       <enum name="DIAMETER_ERROR_RAT_TYPE_NOT_ALLOWED" code="5452"/>
+                       <enum name="DIAMETER_ERROR_SUBSESSION" code="5470"/>
+                       <enum name="DIAMETER_ERROR_UNAUTHORIZED_REQUESTING_NETWORK" code="5490"/>
+               </avp>
+               <!-- RFC3588 AVP -->
+               <avp name="Inband-Security-Id" code="299" mandatory="must" may-encrypt="no" protected="may" vendor-bit="mustnot">
+                       <type type-name="Unsigned32"/>
+                               <enum name="NO_INBAND_SECURITY" code="0"/>
+                               <enum name="TLS" code="1"/>
+               </avp>
+               <avp name="E2E-Sequence" code="300" mandatory="must">
+                       <grouped>
+                               <gavp name="foo"/>
+                       </grouped>
+               </avp>
+               <!-- 301-317    Unallocated -->
+               <avp name="Unallocated" code="301" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unallocated" code="302" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unallocated" code="303" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unallocated" code="304" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unallocated" code="305" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unallocated" code="306" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unallocated" code="307" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unallocated" code="308" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unallocated" code="309" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unallocated" code="310" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unallocated" code="311" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unallocated" code="312" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unallocated" code="313" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unallocated" code="314" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unallocated" code="315" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unallocated" code="316" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unallocated" code="317" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+
+<!-- AVP:s 318 - 348 Belongs to Diameter Mobile IPv4 Application and is defined in mobileipv4.xml
+318 MIP-FA-to-HA-SPI [RFC4004]
+319 MIP-FA-to-MN-SPI [RFC4004]
+320 MIP-Reg-Request [RFC4004]
+321 MIP-Reg-Reply [RFC4004]
+322 MIP-MN-AAA-Auth [RFC4004]
+323 MIP-HA-to-FA-SPI [RFC4004]
+324 Unassigned
+325 MIP-MN-to-FA-MSA [RFC4004]
+326 MIP-FA-to-MN-MSA [RFC4004]
+327 Unassigned
+328 MIP-FA-to-HA-MSA [RFC4004]
+329 MIP-HA-to-FA-MSA [RFC4004]
+331 MIP-MN-to-HA-MSA [RFC4004]
+332 MIP-HA-to-MN-MSA [RFC4004]
+333 MIP-Mobile-Node-Address [RFC4004]
+334 MIP-Home-Agent-Address [RFC4004]
+335 MIP-Nonce [RFC4004]
+336 MIP-Candidate-Home-Agent-Host [RFC4004]
+337 MIP-Feature-Vector [RFC4004]
+338 MIP-Auth-Input-Data-Length [RFC4004]
+339 MIP-Authenticator-Length [RFC4004]
+340 MIP-Authenticator-Offset [RFC4004]
+341 MIP-MN-AAA-SPI [RFC4004]
+342 MIP-Filter-Rule [RFC4004]
+343 MIP-Session-Key [RFC4004]
+344 MIP-FA-Challenge [RFC4004]
+345 MIP-Algorithm-Type [RFC4004]
+346 MIP-Replay-Mode [RFC4004]
+347 MIP-Originating-Foreign-AAA [RFC4004]
+348 MIP-Home-Agent-Host [RFC4004]
+-->
+<!-- AVP:s 349-362        Unassigned -->
+               <avp name="Unassigned" code="349" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="350" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="351" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="352" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="353" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="354" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="355" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="356" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="357" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="358" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="359" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="360" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="361" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="362" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+
+<!-- AVP:s 368 - 393 is in sip.xml
+363 Accounting-Input-Octets [RFC4005][RFC4004]
+364 Accounting-Output-Octets [RFC4005][RFC4004]
+365 Accounting-Input-Packets [RFC4005][RFC4004]
+366 Accounting-Output-Packets [RFC4005][RFC4004]
+367 MIP-MSA-Lifetime [RFC4004]
+368 SIP-Accounting-Information [RFC4740]
+369 SIP-Accounting-Server-URI [RFC4740]
+370 SIP-Credit-Control-Server-URI [RFC4740]
+371 SIP-Server-URI [RFC4740]
+372 SIP-Server-Capabilities [RFC4740]
+373 SIP-Mandatory-Capability [RFC4740]
+374 SIP-Optional-Capability [RFC4740]
+375 SIP-Server-Assignment-Type [RFC4740]
+376 SIP-Auth-Data-Item [RFC4740]
+377 SIP-Authentication-Scheme [RFC4740]
+378 SIP-Item-Number [RFC4740]
+379 SIP-Authenticate [RFC4740]
+380 SIP-Authorization [RFC4740]
+381 SIP-Authentication-Info [RFC4740]
+382 SIP-Number-Auth-Items [RFC4740]
+383 SIP-Deregistration-Reason [RFC4740]
+384 SIP-Reason-Code [RFC4740]
+385 SIP-Reason-Info [RFC4740]
+386 SIP-Visited-Network-Id [RFC4740]
+387 SIP-User-Authorization-Type [RFC4740]
+388 SIP-Supported-User-Data-Type [RFC4740]
+389 SIP-User-Data [RFC4740]
+390 SIP-User-Data-Type [RFC4740]
+391 SIP-User-Data-Contents [RFC4740]
+392 SIP-User-Data-Already-Available [RFC4740]
+393 SIP-Method [RFC4740]
+-->
+<!-- 394-399 Unassigned  -->
+               <avp name="Unassigned" code="394" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="395" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="396" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="397" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="398" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="399" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+
+<!-- 400 408 is defined in nasreq.xml
+400 NAS-Filter-Rule [RFC4005]
+401 Tunneling [RFC4005]
+402 CHAP-Auth [RFC4005]
+403 CHAP-Algorithm [RFC4005]
+404 CHAP-Ident [RFC4005]
+405 CHAP-Response [RFC4005]
+406 Acounting-Auth-Method [RFC4005]
+407 QoS-Filter-Rule [RFC4005]
+408 Origin-AAA-Protocol [RFC4005]
+-->
+<!-- 409-410 Unassigned -->
+               <avp name="Unassigned" code="409" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="410" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+
+<!-- AVP:s 411 - 461 Belongs to Charge Control and is defined in chargecontrol.xml
+411 CC-Correlation-Id [RFC4006]
+412 CC-Input-Octets [RFC4006]
+413 CC-Money [RFC4006]
+414 CC-Output-Octets [RFC4006]
+415 CC-Request-Number [RFC4006]
+416 CC-Request-Type [RFC4006]
+417 CC-Service-Specific-Units [RFC4006]
+418 CC-Session-Failover [RFC4006]
+419 CC-Sub-Session-Id [RFC4006]
+420 CC-Time [RFC4006]
+421 CC-Total-Octets [RFC4006]
+422 Check-Balance-Result [RFC4006]
+423 Cost-Information [RFC4006]
+424 Cost-Unit [RFC4006]
+425 Currency-Code [RFC4006]
+426 Credit-Control [RFC4006]
+427 Credit-Control-Failure-Handling [RFC4006]
+428 Direct-Debiting-Failure-Handling [RFC4006]
+429 Exponent [RFC4006]
+430 Final-Unit-Indication [RFC4006]
+431 Granted-Service-Unit [RFC4006]
+432 Rating-Group [RFC4006]
+433 Redirect-Address-Type [RFC4006]
+434 Redirect-Server [RFC4006]
+435 Redirect-Server-Address [RFC4006]
+436 Requested-Action [RFC4006]
+437 Requested-Service-Unit [RFC4006]
+438 Restriction-Filter-Rule [RFC4006]
+439 Service-Identifier [RFC4006]
+440 Service-Parameter-Info [RFC4006]
+441 Service-Parameter-Type [RFC4006]
+442 Service-Parameter-Value [RFC4006]
+443 Subscription-Id [RFC4006]
+444 Subscription-Id-Data [RFC4006]
+445 Unit-Value [RFC4006]
+446 Used-Service-Unit [RFC4006]
+447 Value-Digits [RFC4006]
+448 Validity-Time [RFC4006]
+449 Final-Unit-Action [RFC4006]
+450 Subscription-Id-Type [RFC4006]
+451 Tariff-Time-Change [RFC4006]
+452 Tariff-Change-Usage [RFC4006]
+453 G-S-U-Pool-Identifier [RFC4006]
+454 CC-Unit-Type [RFC4006]
+455 Multiple-Services-Indicator [RFC4006]
+456 Multiple-Services-Credit-Control [RFC4006]
+457 G-S-U-Pool-Reference [RFC4006]
+458 User-Equipment-Info [RFC4006]
+459 User-Equipment-Info-Type [RFC4006]
+460 User-Equipment-Info-Value [RFC4006]
+461 Service-Context-Id [RFC4006]
+-->
+<!-- epa.xml
+462 EAP-Payload [RFC4072]
+463 EAP-Reissued-Payload [RFC4072]
+464 EAP-Master-Session-Key [RFC4072]
+465 Accounting-EAP-Auth-Method [RFC4072]
+-->
+<!-- 466-479    Unallocated -->
+               <avp name="Unassigned" code="466" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="467" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="468" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="469" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="470" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="471" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="472" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="473" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="474" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="475" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="476" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="477" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="478" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="479" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Accounting-Record-Type" code="480" mandatory="must" may-encrypt="yes" vendor-bit="mustnot">
+                       <type type-name="Enumerated"/>
+                       <enum name="Event Record" code="1"/>
+                       <enum name="Start Record" code="2"/>
+                       <enum name="Interim Record" code="3"/>
+                       <enum name="Stop Record" code="4"/>
+               </avp>
+<!-- 481-482    Unallocated http://www.iana.org/assignments/aaa-parameters/aaa-parameters.xhtml -->
+               <avp name="Unassigned" code="481" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Unassigned" code="482" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Accounting-Realtime-Required" code="483" mandatory="must" may-encrypt="yes" vendor-bit="mustnot">
+                       <type type-name="Unsigned32"/>
+                       <enum name="Reserved" code="0"/>
+                       <enum name="DELIVER_AND_GRANT" code="1"/>
+                       <enum name="GRANT_AND_STORE" code="2"/>
+                       <enum name="GRANT_AND_LOSE" code="3"/>
+               </avp>
+<!-- 484    unallocated  -->
+               <avp name="Unassigned" code="484" mandatory="may">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Accounting-Record-Number" code="485" mandatory="must" may-encrypt="yes" vendor-bit="mustnot">
+                       <type type-name="Unsigned32"/>
+               </avp>
+<!-- 486 - 494 in mobileipv6.xml -->
+               <avp name="TMOD-1" code="495" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot">
+                       <grouped>
+                               <gavp name="Token-Rate"/>
+                               <gavp name="Bucket-Depth"/>
+                               <gavp name="Peak-Traffic-Rate"/>
+                               <gavp name="Minimum-Policed-Unit"/>
+                               <gavp name="Maximum-Packet-Size"/>
+                       </grouped>
+               </avp>
+               <avp name="Token-Rate" code="496" mandatory="may">
+                       <type type-name="Float32"/>
+               </avp>
+               <avp name="Bucket-Depth" code="497" mandatory="may">
+                       <type type-name="Float32"/>
+               </avp>
+               <avp name="Peak-Traffic-Rate" code="498" mandatory="may">
+                       <type type-name="Float32"/>
+               </avp>
+               <avp name="Minimum-Policed-Unit" code="499" mandatory="may">
+                       <type type-name="Unsigned32"/>
+               </avp>
+               <avp name="Maximum-Packet-Size" code="500" mandatory="may">
+                       <type type-name="Unsigned32"/>
+               </avp>
+               <avp name="TMOD-2" code="501" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot">
+                       <grouped>
+                               <gavp name="Token-Rate"/>
+                               <gavp name="Bucket-Depth"/>
+                               <gavp name="Peak-Traffic-Rate"/>
+                               <gavp name="Minimum-Policed-Unit"/>
+                               <gavp name="Maximum-Packet-Size"/>
+                       </grouped>
+               </avp>
+               <avp name="Bandwidth" code="502" mandatory="may">
+                       <type type-name="Float32"/>
+               </avp>
+               <avp name="PHB-Class" code="503" mandatory="may">
+                       <type type-name="Unsigned32"/>
+               </avp>
+<!-- 504 - 507 in mobileipv6.xml -->
+<!--
+508 QoS-Resources [RFC5777]
+509 Filter-Rule [RFC5777]
+510 Filter-Rule-Precedence [RFC5777]
+511 Classifier [RFC5777]
+512 Classifier-ID [RFC5777]
+513 Protocol [RFC5777]
+514 Direction [RFC5777]
+515 From-Spec [RFC5777]
+516 To-Spec [RFC5777]
+517 Negated [RFC5777]
+518 IP-Address [RFC5777]
+519 IP-Address-Range [RFC5777]
+520 IP-Address-Start [RFC5777]
+521 IP-Address-End [RFC5777]
+522 IP-Address-Mask [RFC5777]
+523 IP-Mask-Bit-Mask-Width [RFC5777]
+524 MAC-Address [RFC5777]
+525 MAC-Address-Mask [RFC5777]
+526 MAC-Address-Mask-Pattern [RFC5777]
+527 EUI64-Address [RFC5777]
+528 EUI64-Address-Mask [RFC5777]
+529 EUI64-Address-Mask-Pattern [RFC5777]
+530 Port [RFC5777]
+531 Port-Range [RFC5777]
+532 Port-Start [RFC5777]
+533 Port-End [RFC5777]
+534 Use-Assigned-Address [RFC5777]
+535 Diffserv-Code-Point [RFC5777]
+536 Fragmentation-Flag [RFC5777]
+537 IP-Option [RFC5777]
+538 IP-Option-Type [RFC5777]
+539 IP-Option-Value [RFC5777]
+540 TCP-Option [RFC5777]
+541 TCP-Option-Type [RFC5777]
+542 TCP-Option-Value [RFC5777]
+543 TCP-Flags [RFC5777]
+544 TCP-Flag-Type [RFC5777]
+545 ICMP-Type [RFC5777]
+546 ICMP-Type-Number [RFC5777]
+547 ICMP-Code [RFC5777]
+548 ETH-Option [RFC5777]
+549 ETH-Proto-Type [RFC5777]
+550 ETH-Ether-Type [RFC5777]
+551 ETH-SAP [RFC5777]
+552 VLAN-ID-Range [RFC5777]
+553 S-VID-Start [RFC5777]
+554 S-VID-End [RFC5777]
+555 C-VID-Start [RFC5777]
+556 C-VID-End [RFC5777]
+557 User-Priority-Range [RFC5777]
+558 Low-User-Priority [RFC5777]
+559 High-User-Priority [RFC5777]
+560 Time-Of-Day-Condition [RFC5777]
+561 Time-Of-Day-Start [RFC5777]
+562 Time-Of-Day-End [RFC5777]
+563 Day-Of-Week-Mask [RFC5777]
+564 Day-Of-Month-Mask [RFC5777]
+565 Month-Of-Year-Mask [RFC5777]
+566 Absolute-Start-Time [RFC5777]
+567 Absolute-Start-Fractional-Seconds [RFC5777]
+568 Absolute-End-Time [RFC5777]
+569 Absolute-End-Fractional-Seconds [RFC5777]
+570 Timezone-Flag [RFC5777]
+571 Timezone-Offset [RFC5777]
+572 Treatment-Action [RFC5777]
+573 QoS-Profile-Id [RFC5777]
+574 QoS-Profile-Template [RFC5777]
+575 QoS-Semantics [RFC5777]
+576 QoS-Parameters [RFC5777]
+577 Excess-Treatment [RFC5777]
+578 QoS-Capability [RFC5777]
+579 QoS-Authorization-Data [RFC5866] 
+580 Bound-Auth-Session-Id [RFC5866] 
+581 Key [RFC-ietf-dime-local-keytran-14] 
+582 Key-Type [RFC-ietf-dime-local-keytran-14] 
+583 Keying-Material [RFC-ietf-dime-local-keytran-14] 
+584 Key-Lifetime [RFC-ietf-dime-local-keytran-14] 
+585 Key-SPI [RFC-ietf-dime-local-keytran-14] 
+586 Key-Name [RFC-ietf-dime-local-keytran-14] 
+587-0xffffff Unassigned -->
+
+<!-- ************************ END DIAMETER BASE PROTOCOL AVPS ******************* -->
+
+<!--
+3GPP TS 29.230 version 8.7.0 Release 8  Table 7.1: 3GPP specific AVP codes
+100 3GPP-WLAN-APN-Id OctetString 29.234 [6]
+Note: The AVP codes from 1 to 255 are reserved for backwards compatibility with 3GPP RADIUS Vendor
+Specific Attributes (See TS 29.061 [13])
+Note: The AVP codes from 256 to 299 are reserved for future use.
+300 Authentication-Method Enumerated
+301 Authentication-Information-SIM OctetString
+302 Authorization -Information-SIM OctetString
+303 WLAN-User-Data Grouped
+304 Charging-Data Grouped
+305 WLAN-Access Enumerated
+306 WLAN- 3GPP-IP-Access Enumerated
+307 APN-Authorized Grouped
+308 APN-Id
+309 APN-Barring-Type Enumerated
+310 WLAN-Direct-IP-Access Enumerated
+311 Session-Request-Type Enumerated
+312 Routing-Policy IPFilterRule
+313 Max-Requested-Bandwidth OctetString
+314 Charging-Characteristics Integer
+315 Charging-Nodes Grouped
+316 Primary-OCS-Charging-Function-Name DiameterIdentity
+317 Secondary-OCS-Charging-Function-Name DiameterIdentity
+-->
+    <avp name="3GPP-AAA-Server-Name" may-encrypt="yes" vendor-id="TGPP" vendor-bit="must" mandatory="must" code="318">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <!--
+319 Maximum-Number-Accesses Unsigned32
+Note: The AVP codes from 320 to 399 are reserved for TS 29.234
+-->
+               <avp name="GBA-UserSecSettings" code="400" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Transaction-Identifier" code="401" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="NAF-Hostname" code="402" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="GAA-Service-Identifier" code="403" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Key-ExpiryTime" code="404" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="Time"/>
+               </avp>
+               <avp name="ME-Key-Material" code="405" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="UICC-Key-Material" code="406" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="GBA_U-Awareness-Indicator" code="407" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="NO" code="0"/>
+                       <enum name="YES" code="1"/>
+               </avp>
+               <avp name="BootstrapInfoCreationTime" code="408" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="Time"/>
+               </avp>
+               <avp name="GUSS-Timestamp" code="409" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="Time"/>
+               </avp>
+               <avp name="GBA-Type" code="410" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="3G GBA" code="0"/>
+                       <enum name="2G GBA" code="1"/>
+               </avp>
+               <avp name="UE-Id" code="411" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="UE-Id-Type" code="412" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="Private user identity" code="0"/>
+                       <enum name="Public user identity" code="1"/>
+               </avp>
+               <avp name="UICC-App-Label" code="413" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="UICC-ME" code="414" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="GBA_ME" code="0"/>
+                       <enum name="GBA_U" code="1"/>
+               </avp>
+               <avp name="Requested-Key-Lifetime" code="415" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="Time"/>
+               </avp>
+               <avp name="Private-Identity-Request" code="416" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="Private identity requested" code="0"/>
+                       <enum name="Private identity not requested" code="1"/>
+               </avp>
+               <avp name="GBA-Push-Info" code="417" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="NAF-SA-Identifier" code="418" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Security-Feature-Request" code="419" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Security-Feature-Response" code="420" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+<!-- Note: The AVP codes from 421 to 499 are reserved for TS 29.109
+
+               <avp name="Reserved for TS 29.109" code="421" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved for TS 29.109" code="422" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved for TS 29.109" code="423" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved for TS 29.109" code="424" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved for TS 29.109" code="425" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved for TS 29.109" code="426" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved for TS 29.109" code="427" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved for TS 29.109" code="428" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved for TS 29.109" code="429" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved for TS 29.109" code="430" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved for TS 29.109" code="431" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved for TS 29.109" code="432" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved for TS 29.109" code="433" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved for TS 29.109" code="434" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved for TS 29.109" code="435" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved for TS 29.109" code="436" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved for TS 29.109" code="437" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved for TS 29.109" code="438" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Reserved for TS 29.109" code="439" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+29.109 [7]
+Note: The AVP codes from 421 to 499 are reserved for TS 29.109
+-->
+<!-- Ref 3GPP TS 29.209 version 6.7.0 Release 6
+ NOTE AVP 500 - 523 is in gqpolicy.xml
+      AVP 524 - 527 is in TGPPRx.xml (3GPP TS 29.214)
+Note: The AVP codes from 524 to 599 are reserved for TS 29.209 and TS 29.211
+ NOTE AVP 600 - 651 is in imscxdx.xml
+
+Note: The AVP codes from 652 to 699 are reserved for TS 29.229.
+ ************************** 3GPP Sh AVPS        **************************
+ ************************** NOTE see TGPPSh.xml **************************
+ ************************** 3GPP TS 29.329      **************************
+ **************************   700 - 716         **************************
+Note: The AVP codes from 717 to799 are reserved for TS 29.329.
+Note: The AVP codes from 800 to 822 are reserved for TS 32.299.
+-->
+<!-- 3GPP Diameter charging applications (3GPP TS 32.299 version 7.0.0 Release 7)-->
+<!-- Note: The AVP codes from 800 to 822 are reserved for TS 32.299. -->
+               <avp name="Event-Type" code="823" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="SIP-Method"/>
+                               <gavp name="Event"/>
+                               <gavp name="Content-Type"/>
+                               <gavp name="Content-Length"/>
+                               <gavp name="Content-Disposition"/>
+                       </grouped>
+               </avp>
+               <avp name="SIP-Method" code="824" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="Event" code="825" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="Content-Type" code="826" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <!--
+                    In 3GPP TS 32.299 version 6.5.0 Release 6 (2005-12)
+                    type type-name="UTF8String"
+                    but according to 3GPP TS 32.299 version 7.4.0 Release 7(2006-12) it should be:
+               -->
+               <avp name="Content-Length" code="827" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Unsigned32"/>
+               </avp>
+               <avp name="Content-Disposition" code="828" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="Role-Of-Node" code="829" mandatory="must" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="ORIGINATING_ROLE" code="0"/>
+                       <enum name="TERMINATING_ROLE" code="1"/>
+                       <enum name="PROXY_ROLE" code="2"/>
+                       <enum name="B2BUA_ROLE" code="3"/>
+               </avp>
+               <avp name="User-Session-Id" code="830" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="Calling-Party-Address" code="831" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="Called-Party-Address" code="832" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="Time-Stamps" code="833" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="SIP-Request-Timestamp"/>
+                               <gavp name="SIP-Response-Timestamp"/>
+                       </grouped>
+               </avp>
+               <avp name="SIP-Request-Timestamp" code="834" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Time"/>
+               </avp>
+               <avp name="SIP-Response-Timestamp" code="835" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Time"/>
+               </avp>
+               <avp name="Application-Server" code="836" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="Application-provided-Called-Party-Address" code="837" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="Inter-Operator-Identifier" code="838" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Originating-IOI"/>
+                               <gavp name="Terminating-IOI"/>
+                       </grouped>
+               </avp>
+               <avp name="Originating-IOI" code="839" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="Terminating-IOI" code="840" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="IMS-Charging-Identifier" code="841" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="SDP-Session-Description" code="842" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="SDP-Media-components" code="843" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="SDP-Media-Name"/>
+                               <gavp name="SDP-Media-Description"/>
+                       </grouped>
+               </avp>
+               <avp name="SDP-Media-Name" code="844" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="SDP-Media-Description" code="845" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="GPRS-Charging-ID" code="846" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <!-- ETSI TS 132 299 V7.6.0 (2007-06) -->
+               <avp name="GGSN-Address" code="847" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="IPAddress"/>
+               </avp>
+               <avp name="Served-Party-IP-Address" code="848" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="IPAddress"/>
+               </avp>
+               <avp name="Authorised-QoS" code="849" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="Application-Server-Information" code="850" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Application-Server"/>
+                               <gavp name="Application-Provided-Called-Party-Address"/>
+                       </grouped>
+               </avp>
+               <avp name="Trunk-Group-ID" code="851" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Incoming-Trunk-Group-ID"/>
+                               <gavp name="Outgoing-Trunk-Group-ID"/>
+                       </grouped>
+               </avp>
+               <avp name="Incoming-Trunk-Group-ID" code="852" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="Outgoing-Trunk-Group-ID" code="853" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="Bearer-Service" code="854" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Service-ID" code="855" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="PoC-Controlling-Address" code="858" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="PoC-Group-Name" code="859" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="Cause" code="860" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Cause-Code"/>
+                               <gavp name="Node-Functionality"/>
+                       </grouped>
+               </avp>
+               <avp name="Cause-Code" code="861" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="End of REGISTER dialog" code="-3"/>
+                       <enum name="End of SUBSCRIBE dialog" code="-2"/>
+                       <enum name="Successful transaction" code="-1"/>
+                       <enum name="Normal end of session" code="0"/>
+                       <enum name="Unspecified error" code="1"/>
+                       <enum name="Unsuccessful session setup" code="2"/>
+                       <enum name="Internal error" code="3"/>
+                       <enum name="Multiple Choices" code="300"/>
+                       <enum name="Moved Permanently" code="301"/>
+                       <enum name="Moved Temporarily" code="302"/>
+                       <enum name="Use Proxy" code="305"/>
+                       <enum name="Alternative Service" code="380"/>
+                       <enum name="Bad Request" code="400"/>
+                       <enum name="Unauthorized" code="401"/>
+                       <enum name="Payment Required" code="402"/>
+                       <enum name="Forbidden" code="403"/>
+                       <enum name="Not Found" code="404"/>
+                       <enum name="Method Not Allowed" code="405"/>
+                       <enum name="Not Acceptable" code="406"/>
+                       <enum name="Proxy Authentication Required" code="407"/>
+                       <enum name="Request Timeout" code="408"/>
+                       <enum name="Gone" code="410"/>
+                       <enum name="Conditional Request Failed" code="412"/>
+                       <enum name="Request Entity Too Large" code="413"/>
+                       <enum name="Request-URI Too Long" code="414"/>
+                       <enum name="Unsupported Media Type" code="415"/>
+                       <enum name="Unsupported URI Scheme" code="416"/>
+                       <enum name="Unknown Resource-Priority" code="417"/>
+                       <enum name="Bad Extension" code="420"/>
+                       <enum name="Extension Required" code="421"/>
+                       <enum name="Session Interval Too Small" code="422"/>
+                       <enum name="Interval Too Brief" code="423"/>
+                       <enum name="Use Identity Header" code="428"/>
+                       <enum name="Provide Referrer Identity" code="429"/>
+                       <enum name="Bad Identity-Info" code="436"/>
+                       <enum name="Unsupported Certificate" code="437"/>
+                       <enum name="Invalid Identity Header" code="438"/>
+                       <enum name="Temporarily Unavailable" code="480"/>
+                       <enum name="Call/Transaction Does Not Exist" code="481"/>
+                       <enum name="Loop Detected" code="482"/>
+                       <enum name="Too Many Hops" code="483"/>
+                       <enum name="Address Incomplete" code="484"/>
+                       <enum name="Ambiguous" code="485"/>
+                       <enum name="Busy Here" code="486"/>
+                       <enum name="Request Terminated" code="487"/>
+                       <enum name="Not Acceptable Here" code="488"/>
+                       <enum name="Bad Event" code="489"/>
+                       <enum name="Request Pending" code="491"/>
+                       <enum name="Undecipherable" code="493"/>
+                       <enum name="Security Agreement Required" code="494"/>
+                       <enum name="Server Internal Error" code="500"/>
+                       <enum name="Not Implemented" code="501"/>
+                       <enum name="Bad Gateway" code="502"/>
+                       <enum name="Service Unavailable" code="503"/>
+                       <enum name="Server Time-out" code="504"/>
+                       <enum name="Version Not Supported" code="505"/>
+                       <enum name="Message Too Large" code="513"/>
+                       <enum name="Precondition Failure" code="580"/>
+                       <enum name="Busy Everywhere" code="600"/>
+                       <enum name="Decline" code="603"/>
+                       <enum name="Does Not Exist Anywhere" code="604"/>
+                       <enum name="Not Acceptable" code="606"/>
+               </avp>
+               <avp name="Node-Functionality" code="862" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Unsigned32"/>
+                       <enum name="S-CSCF" code="0"/>
+                       <enum name="P-CSCF" code="1"/>
+                       <enum name="I-CSCF" code="2"/>
+                       <enum name="MRFC" code="3"/>
+                       <enum name="MGCF" code="4"/>
+                       <enum name="BGCF" code="5"/>
+                       <enum name="AS" code="6"/>
+                       <enum name="IBCF" code="7"/>
+                       <enum name="S-GW" code="8"/>
+                       <enum name="P-GW" code="9"/>
+               </avp>
+               <avp name="Service-Specific-Data" code="863" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="Originator" code="864" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="Calling Party" code="0"/>
+                       <enum name="Called Party" code="1"/>
+               </avp>
+               <avp name="PS-Furnish-Charging-Information" code="865" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="GPRS-Charging-Id"/>
+                               <gavp name="PS-Free-Format-Data"/>
+                               <gavp name="PS-Append-Free-Format-Data"/>
+                       </grouped>
+               </avp>
+               <avp name="PS-Free-Format-Data" code="866" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="PS-Append-Free-Format-Data" code="867" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="Append" code="0"/>
+                       <enum name="Overwrite" code="1"/>
+               </avp>
+               <avp name="Time-Quota-Threshold" code="868" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Unsigned32"/>
+               </avp>
+               <avp name="Volume-Quota-Threshold" code="869" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Unsigned32"/>
+               </avp>
+               <avp name="Trigger-Type" code="870" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="CHANGE_IN_SGSN_IP_ADDRESS" code="1"/>
+                       <enum name="CHANGE_IN_QOS" code="2"/>
+                       <enum name="CHANGE_IN_LOCATION" code="3"/>
+                       <enum name="CHANGE_IN_RAT" code="4"/>
 
-               </avp>          
-               <avp name="Acct-Application-Id" code="259" mandatory="must" protected="mustnot" may-encrypt="no" vendor-bit="mustnot">
-                       <type type-name="AppId"/>
-                       <enum name="Diameter Common Messages" code="0"/>
-                       <enum name="Diameter NASREQ Application" code="1"/>
-                       <enum name="Diameter Mobile IPv4 Application" code="2"/>
-                       <enum name="Diameter Base Accounting" code="3"/>
-      <enum name="Diameter Credit Control" code="4"/>
-      <enum name="Diameter EAP" code="5"/>
-      <enum name="Diameter Session Initiation Protocol (SIP) Application" code="6"/>
-      <enum name="3GPP CX/DX" code="16777216"/>
-                       <enum name="3GPP Sh" code="16777217"/>
-                       <enum name="3GPP Re/Rf" code="16777218"/>
-                       <enum name="3GPP Wx" code="16777219"/>
-                       <enum name="GPP Zn" code="16777220"/>
-                       <enum name="3GPP Zh" code="16777221"/>
-                       <enum name="3GPP Gq" code="16777222"/>
-                       <enum name="3GPP Gmb" code="16777223"/>
-                       <enum name="3GPP Gx" code="16777224"/>
-                       <enum name="3GPP Gx over Gy" code="16777225"/>
-                       <enum name="3GPP MM10" code="16777226"/>
-                       <enum name="Ericsson MSI" code="16777227"/>
-                       <enum name="Ericsson Zx" code="16777228"/>
-                       <enum name="3GPP Rx" code="16777229"/>
-                       <enum name="3GPP Pr" code="16777230"/>
-                       <enum name="ETSI e4" code="16777231"/>
-                       <enum name="Ericsson Charging-CIP" code="16777232"/>
-                       <enum name="Ericsson Mm" code="16777233"/>
-                       <enum name="Vodafone Gx+" code="16777234"/>
-                       <enum name="ITU-T Rs" code="16777235"/>
-                       <enum name="3GPP Rx" code="16777236"/>
-                       <enum name="3GPP2 Ty" code="16777237"/>
-                       <enum name="3GPP Gx" code="16777238"/>
-                       <enum name="Juniper Cluster" code="16777239"/>
-                       <enum name="Juniper Policy-Control-AAA" code="16777240"/>
-                       <enum name="iptego USPI" code="16777241"/>
-                       <enum name="Covergence-specific SIP routing" code="16777242"/>   
-                       <enum name="Policy Processing" code="16777243"/>   
-                       <enum name="Juniper Policy-Control-JSRC" code="16777244"/>   
-                       <enum name="ITU-T S-TC1" code="16777245"/>                                              <!-- ITU-T Rec. Q.3221 --> 
-                       <enum name="Relay" code="4294967295"/>
-      <enum name="NSN Unified Charging Trigger Function (UCTF)" code="16777246"/>
-      <enum name="3GPP2 CAN Access Authentication and Authorization" code="16777247"/>
-      <enum name="3GPP2 WLAN Interworking Access Authentication and Authorization" code="16777248"/>
-      <enum name="3GPP2 WLAN Interworking Accounting" code="16777249"/>
-      <enum name="3GPP STaMIP" code="16777250"/>
-      <enum name="3GPP S6a" code="16777251"/>
-      <enum name="3GPP S13" code="16777252"/>
-    </avp>
-               <avp name="Vendor-Specific-Application-Id" code="260" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot">
+                       <enum name="Undefined" code="5"/>
+                       <enum name="Undefined" code="6"/>
+                       <enum name="Undefined" code="7"/>
+                       <enum name="Undefined" code="8"/>
+                       <enum name="Undefined" code="9"/>
+
+                       <enum name="CHANGEINQOS_TRAFFIC_CLASS" code="10"/>
+                       <enum name="CHANGEINQOS_RELIABILITY_CLASS" code="11"/>
+                       <enum name="CHANGEINQOS_DELAY_CLASS" code="12"/>
+                       <enum name="CHANGEINQOS_PEAK_THROUGHPUT" code="13"/>
+                       <enum name="CHANGEINQOS_PRECEDENCE_CLASS" code="14"/>
+                       <enum name="CHANGEINQOS_MEAN_THROUGHPUT" code="15"/>
+                       <enum name="CHANGEINQOS_MAXIMUM_BIT_RATE_FOR_UPLINK" code="16"/>
+                       <enum name="CHANGEINQOS_MAXIMUM_BIT_RATE_FOR_DOWNLINK" code="17"/>
+                       <enum name="CHANGEINQOS_RESIDUAL_BER" code="18"/>
+                       <enum name="CHANGEINQOS_SDU_ERROR_RATIO" code="19"/>
+                       <enum name="CHANGEINQOS_TRANSFER_DELAY" code="20"/>
+                       <enum name="CHANGEINQOS_TRAFFIC_HANDLING_PRIORITY" code="21"/>
+                       <enum name="CHANGEINQOS_GUARANTEED_BIT_RATE_FOR_UPLINK" code="22"/>
+                       <enum name="CHANGEINQOS_GUARANTEED_BIT_RATE_FOR_DOWNLINK" code="23"/>
+
+                       <enum name="Undefined" code="24"/>
+                       <enum name="Undefined" code="25"/>
+                       <enum name="Undefined" code="26"/>
+                       <enum name="Undefined" code="27"/>
+                       <enum name="Undefined" code="28"/>
+                       <enum name="Undefined" code="29"/>
+
+                       <enum name="CHANGEINLOCATION_MCC" code="30"/>
+                       <enum name="CHANGEINLOCATION_MNC" code="31"/>
+                       <enum name="CHANGEINLOCATION_RAC" code="32"/>
+                       <enum name="CHANGEINLOCATION_LAC" code="33"/>
+                       <enum name="CHANGEINLOCATION_CellId" code="34"/>
+                       <enum name="CHANGEINLOCATION_TAC" code="35"/>
+                       <enum name="CHANGEINLOCATION_ECGI" code="36"/>
+                       <enum name="Undefined" code="37"/>
+                       <enum name="Undefined" code="38"/>
+                       <enum name="Undefined" code="39"/>
+
+                       <enum name="CHANGE_IN_MEDIA_COMPOSITION" code="40"/>
+
+                       <enum name="Undefined" code="41"/>
+                       <enum name="Undefined" code="42"/>
+                       <enum name="Undefined" code="43"/>
+                       <enum name="Undefined" code="44"/>
+                       <enum name="Undefined" code="45"/>
+                       <enum name="Undefined" code="46"/>
+                       <enum name="Undefined" code="47"/>
+                       <enum name="Undefined" code="48"/>
+                       <enum name="Undefined" code="49"/>
+
+                       <enum name="CHANGEINPARTICIPANTS_Number" code="50"/>
+                       <enum name="CHANGE_IN_THRSHLD_OF_PARTICIPANTS_NMB" code="51"/>
+                       <enum name="CHANGE_IN_USER_PARTICIPATING_TYPE" code="52"/>
+
+                       <enum name="Undefined" code="53"/>
+                       <enum name="Undefined" code="54"/>
+                       <enum name="Undefined" code="55"/>
+                       <enum name="Undefined" code="56"/>
+                       <enum name="Undefined" code="57"/>
+                       <enum name="Undefined" code="58"/>
+                       <enum name="Undefined" code="59"/>
+
+                       <enum name="CHANGE_IN_SERVICE_CONDITION" code="60"/>
+                       <enum name="CHANGE_IN_SERVING_NODE" code="61"/>
+                       <enum name="Undefined" code="62"/>
+                       <enum name="Undefined" code="63"/>
+                       <enum name="Undefined" code="64"/>
+                       <enum name="Undefined" code="65"/>
+                       <enum name="Undefined" code="66"/>
+                       <enum name="Undefined" code="67"/>
+                       <enum name="Undefined" code="68"/>
+                       <enum name="Undefined" code="69"/>
+
+                       <enum name="CHANGE_IN_USER_CSG_INFORMATION" code="70"/>
+                       <enum name="CHANGE_IN_HYBRID_SUBSCRIBED_USER_CSG_INFORMATION" code="71"/>
+                       <enum name="CHANGE_IN_HYBRID_UNSUBSCRIBED_USER_CSG_INFORMATION" code="72"/>
+
+               </avp>
+               <avp name="Quota-Holding-Time" code="871" mandatory="must" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Unsigned32"/>
+               </avp>
+               <avp name="Reporting-Reason" code="872" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="THRESHOLD" code="0"/>
+                       <enum name="QHT" code="1"/>
+                       <enum name="FINAL" code="2"/>
+                       <enum name="QUOTA_EXHAUSTED" code="3"/>
+                       <enum name="VALIDITY_TIME" code="4"/>
+                       <enum name="OTHER_QUOTA_TYPE" code="5"/>
+                       <enum name="RATING_CONDITION_CHANGE" code="6"/>
+                       <enum name="FORCED_REAUTHORISATION" code="7"/>
+                       <enum name="POOL_EXHAUSTED" code="8"/>
+               </avp>
+               <avp name="Service-Information" code="873" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="PS-Information"/>
+                               <gavp name="WLAN-Information"/>
+                               <gavp name="IMS-Information"/>
+                               <gavp name="MMS-Information"/>
+                               <gavp name="LCS-Information"/>
+                               <gavp name="PoC-Information"/>
+                               <gavp name="MBMS-Information"/>
+                       </grouped>
+               </avp>
+               <avp name="PS-Information" code="874" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="3GPP-Charging-Id"/>
+                               <gavp name="PDN-Connection-ID"/>
+                               <gavp name="Node-Id"/>
+                               <gavp name="3GPP-PDP Type"/>
+                               <gavp name="PDP-Address"/>
+                               <gavp name="Dynamic-Address-Flag"/>
+                               <gavp name="3GPP-GPRS-Negotiated-QoS-Profile"/> <!-- ??-->
+                               <gavp name="QoS-Information"/>
+                               <gavp name="SGSN-Address"/>
+                               <gavp name="GGSN-Address"/>
+                               <gavp name="CG-Address"/>
+                               <gavp name="Serving-Node-Type"/>
+                               <gavp name="SGW-Change"/>
+                               <gavp name="3GPP-IMSI-MCC-MNC"/>
+                               <gavp name="IMSI-Unauthenticated-Flag"/>
+                               <gavp name="3GPP-GGSN-MCC-MNC"/>
+                               <gavp name="3GPP-NSAPI"/>
+                               <gavp name="Called-Station-Id"/>
+                               <gavp name="3GPP-Session-Stop-Indicator"/>
+                               <gavp name="3GPP-Selection-Mode"/>
+                               <gavp name="3GPP-Charging-Characteristics"/>
+                               <gavp name="Charging-Characteristics-Selection-Mode"/>
+                               <gavp name="3GPP-SGSN-MCC-MNC"/>
+                               <gavp name="3GPP-MS-TimeZone"/>
+                               <gavp name="3GPP-CAMEL-Charging-Info"/>         <!-- ??-->
+                               <gavp name="Charging-Rule-Base-Name"/>
+                               <gavp name="3GPP-User-Location-Info"/>
+                               <gavp name="3GPP-RAT-Type"/>
+                               <gavp name="PS-Furnish-Charging-Information"/>
+                               <gavp name="PDP-Context-Type"/>
+                               <gavp name="Offline-Charging"/>
+                               <gavp name="Traffic-Data-Volumes"/>
+                               <gavp name="Service-Data-Container"/>
+                               <gavp name="User-Equipment-Info"/>
+                               <gavp name="Terminal-Information"/>
+                               <gavp name="Start-Time"/>
+                               <gavp name="Stop-Time"/>
+                               <gavp name="Change-Condition"/>
+                               <gavp name="Diagnostics"/>
+                               <gavp name="Low-Priority-Indicator"/>
+                       </grouped>
+               </avp>
+               <avp name="WLAN-Information" code="875" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
                        <grouped>
-                               <gavp name="Vendor-Id"/>
-                               <gavp name="Auth-Application-Id"/>
-                               <gavp name="Acct-Application-Id"/>
+                               <gavp name="WLAN-Session-Id"/>
+                               <gavp name="PDG-Address"/>
+                               <gavp name="NPDG-Charging-Id"/>
+                               <gavp name="WAG-Address"/>
+                               <gavp name="WAG-PLMN-Id"/>
+                               <gavp name="WLAN-Radio-Container"/>
+                               <gavp name="WLAN-UE-Local-IPAddress"/>
                        </grouped>
                </avp>
-               <avp name="Redirect-Host-Usage" code="261" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot">
-                       <type type-name="Unsigned32"/>
-                       <enum name="Don't Care" code="0"/>
-                       <enum name="All Session" code="1"/>
-                       <enum name="All Realm" code="2"/>
-                       <enum name="Realm and Application" code="3"/>
-                       <enum name="All Application" code="4"/>
-      <enum name="All Host" code="5"/>
-      <enum name="ALL_USER" code="6"/>
-    </avp>
-               <avp name="Redirect-Max-Cache-Time" code="262" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot">
+               <avp name="IMS-Information" code="876" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Event-Type"/>
+                               <gavp name="Role-Of-Node"/>
+                               <gavp name="Node-Functionality"/>
+                               <gavp name="User-Session-ID"/>
+                               <gavp name="Calling-Party-Address"/>
+                               <gavp name="Called-Party-Address"/>
+                               <gavp name="Time-Stamps"/>
+                               <gavp name="Application-Server-Information"/>
+                               <gavp name="Inter-Operator-Identifier"/>
+                               <gavp name="IMS-Charging-Identifier"/>
+                               <gavp name="SDP-Session-Description"/>
+                               <gavp name="SDP-Media-Component"/>
+                               <gavp name="GGSN-Address"/>
+                               <gavp name="Served-Party-IP-Address"/>
+                               <gavp name="Server-Capabilities"/>
+                               <gavp name="Trunk-Group-ID"/>
+                               <gavp name="Bearer-Service"/>
+                               <gavp name="Service-Id"/>
+                               <gavp name="Service-Specific-Data"/>
+                               <gavp name="Message-Body"/>
+                               <gavp name="Cause-Code"/>
+                               <gavp name="Access-Network-Information"/>
+                               <gavp name="Early-Media-Description"/>
+                               <gavp name="IMS-Communication-Service-Identifier"/>
+                       </grouped>
+               </avp>
+               <avp name="MMS-Information" code="877" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Originator-Address"/>
+                               <gavp name="Recipient-Address"/>
+                               <gavp name="Submission-Time"/>
+                               <gavp name="MM-Content-Type"/>
+                               <gavp name="Priority"/>
+                               <gavp name="Message-ID"/>
+                               <gavp name="Message-Type"/>
+                               <gavp name="Message-Size"/>
+                               <gavp name="Message-Class"/>
+                               <gavp name="Delivery-Report-Requested"/>
+                               <gavp name= "Read-Reply-Report-Requested"/>
+                               <gavp name="MMBox-Storage-Information"/>
+                               <gavp name="Applic-ID"/>
+                               <gavp name="Reply-Applic-ID"/>
+                               <gavp name="Aux-Applic-Info"/>
+                               <gavp name="Content-Class"/>
+                               <gavp name="DRM-Content"/>
+                               <gavp name="Adaptations"/>
+                               <gavp name="VASP-Id"/>
+                               <gavp name="VAS-Id"/>
+                       </grouped>
+               </avp>
+               <avp name="LCS-Information" code="878" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="LCS-Client-ID"/>
+                               <gavp name="Location-Type"/>
+                               <gavp name="Location-Estimate"/>
+                               <gavp name="Positioning-Data"/>
+                               <gavp name="IMSI"/>
+                               <gavp name="MSISDN"/>
+                       </grouped>
+               </avp>
+               <avp name="PoC-Information" code="879" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="PoC-Server-Role"/>
+                               <gavp name="PoC-Session-Type"/>
+                               <gavp name="PoC-User-Role"/>
+                               <gavp name="PoC-Session-Initiation-type"/>
+                               <gavp name="PoC-Event-Type"/>
+                               <gavp name="Number-Of-Participants"/>
+                               <gavp name="Participants-Involved"/>
+                               <gavp name="Participant-Group"/>
+                               <gavp name="Talk-Burst-Exchange"/>
+                               <gavp name="PoC-Controlling-Address"/>
+                               <gavp name="PoC-Group-Name"/>
+                               <gavp name="PoC-Session-Id"/>
+                               <gavp name="Charged-Party"/>
+                       </grouped>
+               </avp>
+               <avp name="MBMS-Information" code="880" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="TMGI"/>
+                               <gavp name="MBMS-Service-Type"/>
+                               <gavp name="MBMS-User-Service-Type"/>
+                               <gavp name="File-Repair-Supported"/>
+                               <gavp name="Required-MBMS-Bearer-Capabilities"/>
+                               <gavp name="MBMS-2G-3G-Indicator"/>
+                               <gavp name="RAI"/>
+                               <gavp name="MBMS-Service-Area"/>
+                               <gavp name="MBMS-Session-Identity"/>
+                       </grouped>
+               </avp>
+               <avp name="Quota-Consumption-Time" code="881" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Unsigned32"/>
                </avp>
-               <avp name="Session-Id" code="263" mandatory="must" protected="mustnot" vendor-bit="mustnot">
+               <avp name="Media-Initiator-Flag" code="882" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="called party" code="0"/>
+                       <enum name="calling party" code="1"/>
+                       <enum name="unknown" code="2"/>
+               </avp>
+               <avp name="PoC-Server-Role" code="883" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="Participating PoC Server" code="0"/>
+                       <enum name="Controlling PoC Server" code="1"/>
+               </avp>
+               <avp name="PoC-Session-Type" code="884" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="1 to 1 PoC session" code="0"/>
+                       <enum name="chat PoC group session" code="1"/>
+                       <enum name="pre-arranged PoC group session" code="2"/>
+                       <enum name="ad-hoc PoC group session" code="3"/>
+               </avp>
+               <avp name="Number-Of-Participants" code="885" mandatory="must" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Integer32"/>
+               </avp>
+               <avp name="Originator-Address" code="886" mandatory="must" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Address-Type"/>
+                               <gavp name="Address-Data"/>
+                               <gavp name="Address-Domain"/>
+                       </grouped>
+               </avp>
+               <avp name="Participants-Involved" code="887" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="UTF8String"/>
                </avp>
-               <avp name="Origin-Host" code="264" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot">
-                       <type type-name="DiameterIdentity"/>
+               <avp name="Expires" code="888" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Unsigned32"/>
                </avp>
-               <avp name="Supported-Vendor-Id" code="265" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot">
-                       <type type-name="VendorId"/>
+               <avp name="Message-Body" code="889" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Content-Type"/>
+                               <gavp name="Content-Length"/>
+                               <gavp name="Content-Disposition"/>
+                               <gavp name="Originator"/>
+                       </grouped>
                </avp>
-               <avp name="Vendor-Id" code="266" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot">
-                       <type type-name="VendorId"/>
+               <avp name="WAG-Address" code="890" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="IPAddress"/>
+               </avp>
+               <avp name="WAG-PLMN-Id" code="891" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="WLAN-Radio-Container" code="892" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Operator-Name"/>
+                               <gavp name="Location-Type"/>
+                               <gavp name="Location-Information"/>
+                               <gavp name="WLAN-Technology"/>
+                       </grouped>
                </avp>
-               <avp name="Firmware-Revision" code="267" mandatory="must" protected="mustnot" may-encrypt="no" vendor-bit="mustnot">
+               <avp name="WLAN-Technology" code="893" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Unsigned32"/>
                </avp>
-               <avp name="Result-Code" code="268" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot">
+               <avp name="WLAN-UE-Local-IPAddress" code="894" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="IPAddress"/>
+               </avp>
+               <avp name="PDG-Address" code="895" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="IPAddress"/>
+               </avp>
+               <avp name="PDG-Charging-Id" code="896" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Unsigned32"/>
-                       <enum name="DIAMETER_MULTI_ROUND_AUTH" code="1001"/>
-      
-                       <enum name="DIAMETER_SUCCESS" code="2001"/>
-                       <enum name="DIAMETER_LIMITED_SUCCESS" code="2002"/>
-                       <enum name="DIAMETER_FIRST_REGISTRATION" code="2003"/>
-                       <enum name="DIAMETER_SUBSEQUENT_REGISTRATION" code="2004"/>
-                       <enum name="DIAMETER_UNREGISTERED_SERVICE" code="2005"/>
-                       <enum name="DIAMETER_SUCCESS_SERVER_NAME_NOT_STORED" code="2006"/>
-                       <enum name="DIAMETER_SERVER_SELECTION" code="2007"/>
-                       <enum name="DIAMETER_SUCCESS_AUTH_SENT_SERVER_NOT_STORED" code="2008"/>
-
-                       <enum name="DIAMETER_COMMAND_UNSUPPORTED" code="3001"/>
-                       <enum name="DIAMETER_UNABLE_TO_DELIVER" code="3002"/>
-                       <enum name="DIAMETER_REALM_NOT_SERVED" code="3003"/>
-                       <enum name="DIAMETER_TOO_BUSY" code="3004"/>
-                       <enum name="DIAMETER_LOOP_DETECTED" code="3005"/>
-                       <enum name="DIAMETER_REDIRECT_INDICATION" code="3006"/>
-                       <enum name="DIAMETER_APPLICATION_UNSUPPORTED" code="3007"/>
-                       <enum name="DIAMETER_INVALID_HDR_BITS" code="3008"/>
-                       <enum name="DIAMETER_INVALID_AVP_BITS" code="3009"/>
-                       <enum name="DIAMETER_UNKNOWN_PEER" code="3010"/>
-
-                       <enum name="DIAMETER_AUTHENTICATION_REJECTED" code="4001"/>
-                       <enum name="DIAMETER_OUT_OF_SPACE" code="4002"/>
-                       <enum name="DIAMETER_ELECTION_LOST" code="4003"/>
-                       <enum name="DIAMETER_ERROR_MIP_REPLY_FAILURE" code="4005"/>
-                       <enum name="DIAMETER_ERROR_HA_NOT_AVAILABLE" code="4006"/>
-                       <enum name="DIAMETER_ERROR_BAD_KEY" code="4007"/>
-                       <enum name="DIAMETER_ERROR_MIP_FILTER_NOT_SUPPORTED" code="4008"/>
-                       <enum name="DIAMETER_END_USER_SERVICE_DENIED" code="4010"/>
-                       <enum name="DIAMETER_CREDIT_CONTROL_NOT_APPLICABLE" code="4011"/>
-                       <enum name="DIAMETER_CREDIT_LIMIT_REACHED" code="4012"/>
-                       <enum name="DIAMETER_USER_NAME_REQUIRED" code="4013"/>
-
-                       <enum name="DIAMETER_AVP_UNSUPPORTED" code="5001"/>
-                       <enum name="DIAMETER_UNKNOWN_SESSION_ID" code="5002"/>
-                       <enum name="DIAMETER_AUTHORIZATION_REJECTED" code="5003"/>
-                       <enum name="DIAMETER_INVALID_AVP_VALUE" code="5004"/>
-                       <enum name="DIAMETER_MISSING_AVP" code="5005"/>
-                       <enum name="DIAMETER_RESOURCES_EXCEEDED" code="5006"/>
-                       <enum name="DIAMETER_CONTRADICTING_AVPS" code="5007"/>
-                       <enum name="DIAMETER_AVP_NOT_ALLOWED" code="5008"/>
-                       <enum name="DIAMETER_AVP_OCCURS_TOO_MANY_TIMES" code="5009"/>
-                       <enum name="DIAMETER_NO_COMMON_APPLICATION " code="5010"/>
-                       <enum name="DIAMETER_UNSUPPORTED_VERSION" code="5011"/>
-                       <enum name="DIAMETER_UNABLE_TO_COMPLY" code="5012"/>
-                       <enum name="DIAMETER_INVALID_BIT_IN_HEADER" code="5013"/>
-                       <enum name="DIAMETER_INVALID_AVP_LENGTH" code="5014"/>
-                       <enum name="DIAMETER_INVALID_MESSAGE_LENGTH" code="5015"/>
-                       <enum name="DIAMETER_INVALID_AVP_BIT_COMBO" code="5016"/>
-                       <enum name="DIAMETER_NO_COMMON_SECURITY" code="5017"/>
-                       <enum name="DIAMETER_RADIUS_AVP_UNTRANSLATABLE" code="5018"/>
-                       <enum name="DIAMETER_ERROR_NO_FOREIGN_HA_SERVICE" code="5024"/>
-                       <enum name="DIAMETER_ERROR_END_TO_END_MIP_KEY_ENCRYPTION" code="5025"/>
-                       <enum name="DIAMETER_USER_UNKNOWN" code="5030"/>
-                       <enum name="DIAMETER_RATING_FAILED" code="5031"/>
-                       <enum name="DIAMETER_ERROR_USER_UNKNOWN" code="5032"/>
-                       <enum name="DIAMETER_ERROR_IDENTITIES_DONT_MATCH" code="5033"/>
-                       <enum name="DIAMETER_ERROR_IDENTITY_NOT_REGISTERED" code="5034"/>
-                       <enum name="DIAMETER_ERROR_ROAMING_NOT_ALLOWED" code="5035"/>
-                       <enum name="DIAMETER_ERROR_IDENTITY_ALREADY_REGISTERED" code="5036"/>
-                       <enum name="DIAMETER_ERROR_AUTH_SCHEME_NOT_SUPPORTED" code="5037"/>
-                       <enum name="DIAMETER_ERROR_IN_ASSIGNMENT_TYPE" code="5038"/>
-                       <enum name="DIAMETER_ERROR_TOO_MUCH_DATA" code="5039"/>
-                       <enum name="DIAMETER_ERROR_NOT SUPPORTED_USER_DATA" code="5040"/>
                </avp>
-               <avp name="Product-Name" code="269" mandatory="mustnot" may-encrypt="no" protected="mustnot" vendor-bit="mustnot">
-                       <type type-name="UTF8String"/>
+               <avp name="Address-Data" code="897" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="Address-Domain" code="898" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Domain-Name"/>
+                               <gavp name="3GPP-IMSI-MCC-MNC"/>
+                       </grouped>
+               </avp>
+               <avp name="Address-Type" code="899" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="e-mail address" code="0"/>
+                       <enum name="MSISDN" code="1"/>
+                       <enum name="IPv4 Address" code="2"/>
+                       <enum name="IPv6 Address" code="3"/>
+                       <enum name="Numeric Shortcode" code="4"/>
+                       <enum name="Alphanumeric Shortcode" code="5"/>
+                       <enum name="Other" code="6"/>
+               </avp>
+<!--
+Note: The AVP codes from 900 to 999 are reserved for TS 29.061
+29.210 -> 3GPP TS 29.212
+******** Found in TGPPGmb.xml ********
+-->
+               <avp name="Bearer-Usage" code="1000" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="GENERAL" code="0"/>
+                       <enum name="IMS SIGNALLING" code="1"/>
+                       <enum name="DEDICATED" code="2"/>
+               </avp>
+               <avp name="Charging-Rule-Install" code="1001" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Charging-Rule-Definition"/>
+                               <gavp name="Charging-Rule-Name"/>
+                               <gavp name="Charging-Rule-Base-Name"/>
+                               <gavp name="Bearer-Identifier"/>
+                               <gavp name="Rule-Activation-Time"/>
+                               <gavp name="Rule-Deactivation-Time"/>
+                               <gavp name="Resource-Allocation-Notification"/>
+                       </grouped>
+               </avp>
+               <avp name="Charging-Rule-Remove" code="1002" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Charging-Rule-Name"/>
+                               <gavp name="Charging-Rule-Base-Name"/>
+                       </grouped>
+               </avp>
+               <avp name="Charging-Rule-Definition" code="1003" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Charging-Rule-Name"/>
+                               <gavp name="Service-Identifier"/>
+                               <gavp name="Rating-Group"/>
+                               <gavp name="Flow-Description"/>
+                               <gavp name="Flow-Information"/>
+                               <gavp name="Flow-Status"/>
+                               <gavp name="QoS-Information"/>
+                               <gavp name="Reporting-Level"/>
+                               <gavp name="Online"/>
+                               <gavp name="Offline"/>
+                               <gavp name="Metering-Method"/>
+                               <gavp name="Precedence"/>
+                               <gavp name="AF-Charging-Identifier"/>
+                               <gavp name="Flows"/>
+                               <gavp name="Monitoring-Key"/>
+                               <gavp name="AF-Signalling-Protocol"/>
+                       </grouped>
+               </avp>
+               <avp name="Charging-Rule-Base-Name" code="1004" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="Charging-Rule-Name" code="1005" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Event-Trigger" code="1006" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="SGSN CHANGE"                                code="0"/>
+                       <enum name="QOS CHANGE"                                 code="1"/>
+                       <enum name="RAT CHANGE"                                 code="2"/>
+                       <enum name="TFT CHANGE"                                 code="3"/>
+                       <enum name="PLMN CHANGE"                                code="4"/>
+                       <enum name="LOSS_OF_BEARER"                             code="5"/>
+                       <enum name="RECOVERY_OF_BEARER"                         code="6"/>
+                       <enum name="IP-CAN_CHANGE"                              code="7"/>
+                       <enum name="GW-PCEF-MALFUNCTION"                        code="8"/>
+                       <enum name="RESOURCES_LIMITATION"                       code="9"/>
+                       <enum name="MAX_NR_BEARERS_REACHED"                     code="10"/>
+                       <enum name="QOS_CHANGE_EXCEEDING_AUTHORIZATION"         code="11"/>
+                       <enum name="RAI_CHANGE"                                 code="12"/>
+                       <enum name="USER_LOCATION_CHANGE"                       code="13"/>
+                       <enum name="NO_EVENT_TRIGGERS"                          code="14"/>
+                       <enum name="OUT_OF_CREDIT"                              code="15"/>
+                       <enum name="REALLOCATION_OF_CREDIT"                     code="16"/>
+                       <enum name="REVALIDATION_TIMEOUT"                       code="17"/>
+                       <enum name="UE_IP_ADDRESS_ALLOCATE"                     code="18"/>
+                       <enum name="UE_IP_ADDRESS_RELEASE"                      code="19"/>
+                       <enum name="DEFAULT_EPS_BEARER_QOS_CHANGE"              code="20"/>
+                       <enum name="AN_GW_CHANGE"                               code="21"/>
+                       <enum name="SUCCESSFUL_RESOURCE_ALLOCATION"             code="22"/>
+                       <enum name="RESOURCE_MODIFICATION_REQUEST"              code="23"/>
+                       <enum name="PGW_TRACE_CONTROL"                          code="24"/>
+                       <enum name="UE_TIME_ZONE_CHANGE"                        code="25"/>
+                       <enum name="USAGE_REPORT"                               code="26"/>
+                       <enum name="TAI_CHANGE"                                 code="27"/>
+      <enum name="ECGI_CHANGE"                         code="28"/>
+      <enum name="APN-AMBR_MODIFICATION_FAILURE"                               code="29"/>
+      <enum name="USER_CSG_INFORMATION_CHANGE"                         code="30"/>
+      <enum name="USAGE_REPORT"                                code="33"/>
+      <enum name="DEFAULT-EPS-BEARER-QOS_MODIFICATION_FAILURE"                         code="34"/>
+      <enum name="USER_CSG_HYBRID_SUBSCRIBED_INFORMATION_CHANGE"                               code="35"/>
+      <enum name="USER_CSG_ HYBRID_UNSUBSCRIBED_INFORMATION_CHANGE"                            code="36"/>
+      <enum name="ROUTING_RULE_CHANGE"                         code="37"/>
+      <enum name="MAX_MBR_APN_AMBR_CHANGE"                             code="38"/>
+      <enum name="APPLICATION_START"                           code="39"/>
+      <enum name="APPLICATION_STOP"                            code="40"/>
+      <enum name="TIME_CHANGE"                         code="100"/>
+                       <enum name="TFT DELETED"                                code="1000"/>
+                       <enum name="LOSS OF BEARER"                             code="1001"/>
+                       <enum name="RECOVERY OF BEARER"                         code="1002"/>
+                       <enum name="POLICY ENFORCEMENT FAILED"                  code="1003"/>
+               </avp>
+               <avp name="Metering-Method" code="1007" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="DURATION" code="0"/>
+                       <enum name="VOLUME" code="1"/>
+                       <enum name="DURATION_VOLUME" code="2"/>
+               </avp>
+               <avp name="Offline" code="1008" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="DISABLE_OFFLINE" code="0"/>
+                       <enum name="ENABLE_OFFLINE" code="1"/>
                </avp>
-               <avp name="Session-Binding" code="270" mandatory="must" protected="mustnot" vendor-bit="mustnot">
+               <avp name="Online" code="1009" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="DISABLE_ONLINE" code="0"/>
+                       <enum name="ENABLE_ONLINE" code="1"/>
+               </avp>
+               <avp name="Precedence" code="1010" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Unsigned32"/>
-                       <enum name="RE_AUTH" code="1"/>
-                       <enum name="STR" code="2"/>
-                       <enum name="Unassigned" code="3"/>
-                       <enum name="ACCOUNTING" code="4"/>
                </avp>
-               <avp name="Session-Server-Failover" code="271" mandatory="must" protected="mustnot" vendor-bit="mustnot">
+               <avp name="Reporting-Level" code="1011" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="CHARGING RULE LEVEL" code="0"/>
+                       <enum name="RATING GROUP LEVEL" code="1"/>
+               </avp>
+               <avp name="TFT-Filter" code="1012" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="IPFilterRule"/>
+               </avp>
+               <avp name="TFT-Packet-Filter-Information" code="1013" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Precedence"/>
+                               <gavp name="TFT-Filter"/>
+                               <gavp name="TOS-Traffic-Class"/>
+                               <gavp name="Security-Parameter-Index"/>
+                               <gavp name="Flow-Label"/>
+                       </grouped>
+               </avp>
+               <avp name="ToS-Traffic-Class" code="1014" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="PDP-Session-operation" code="1015" vendor-id="TGPP" protected="may" mandatory="must" may-encrypt="yes" vendor-bit="must">
+                       <type type-name="Unsigned32" />
+                       <enum name="PDP-SESSION-TERMINATION" code="0"/>
+               </avp>
+               <avp name="QoS-Information" code="1016" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="QoS-Class-Identifier"/>
+                               <gavp name="Max-Requested-Bandwidth-DL"/>
+                               <gavp name="Max-Requested-Bandwidth-UL"/>
+                               <gavp name="Guaranteed-Bitrate-UL"/>
+                               <gavp name="Guaranteed-Bitrate-DL"/>
+                               <gavp name="Bearer-Identifier"/>
+                               <gavp name="Allocation-Retention-Priority"/>
+                               <gavp name="APN-Aggregate-Max-Bitrate-UL"/>
+                               <gavp name="APN-Aggregate-Max-Bitrate-DL"/>
+                       </grouped>
+               </avp>
+               <avp name="Charging-Rule-Report" code="1018" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Charging-Rule-Base-Name"/>
+                               <gavp name="Charging-Rule-Name"/>
+                               <gavp name="Bearer-Identifier"/>
+                               <gavp name="PCC-Rule-Status"/>
+                               <gavp name="Rule-Failure-Code"/>
+                               <gavp name="Final-Unit-Indication"/>
+                       </grouped>
+               </avp>
+               <avp name="PCC-Rule-Status" code="1019" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Unsigned32"/>
-                       <enum name="REFUSE_SERVICE" code="0"/>
-                       <enum name="TRY_AGAIN" code="1"/>
-                       <enum name="ALLOW_SERVICE" code="2"/>
-                       <enum name="TRY_AGAIN_ALLOW_SERVICE" code="3"/>
+                       <enum name="ACTIVE"             code="0"/>
+                       <enum name="INACTIVE"           code="1"/>
+                       <enum name="TEMPORARY_INACTIVE" code="2"/>
                </avp>
-               <avp name="Multi-Round-Time-Out" code="272" mandatory="must" may-encrypt="yes" vendor-bit="mustnot">
+               <avp name="Bearer-Identifier" code="1020" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Bearer-Operation" code="1021" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="TERMINATION"                        code="0"/>
+                       <enum name="ESTABLISHMENT"      code="1"/>
+                       <enum name="MODIFICATION"       code="2"/>
+               </avp>
+               <avp name="Access-Network-Charging-Identifier-Gx" code="1022" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Access-Network-Charging-Identifier-Value"/>
+                               <gavp name="Charging-Rule-Base-Name"/>
+                               <gavp name="Charging-Rule-Name"/>
+                       </grouped>
+               </avp>
+               <avp name="Bearer-Control-Mode" code="1023" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="UE_ONLY"                    code="0"/>
+                       <enum name="RESERVED"   code="1"/>
+                       <enum name="UE_NW"      code="2"/>
+               </avp>
+               <avp name="Network-Request-Support" code="1024" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="NETWORK_REQUEST NOT SUPPORTED"                      code="0"/>
+                       <enum name="NETWORK_REQUEST SUPPORTED"  code="1"/>
+               </avp>
+               <avp name="Guaranteed-Bitrate-DL" code="1025" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Unsigned32"/>
                </avp>
-               <avp name="Disconnect-Cause" code="273" mandatory="must" protected="mustnot" may-encrypt="no" vendor-bit="mustnot">
+               <avp name="Guaranteed-Bitrate-UL" code="1026" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Unsigned32"/>
-                       <enum name="REBOOTING" code="0"/>
-                       <enum name="BUSY" code="1"/>
-                       <enum name="DO_NOT_WANT_TO_TALK_TO_YOU" code="2"/>
                </avp>
-               <avp name="Auth-Request-Type" code="274" mandatory="must" protected="mustnot" may-encrypt="no" vendor-bit="mustnot">
+               <avp name="IP-CAN-Type" code="1027" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="3GPP-GPRS"                  code="0"/>
+                       <enum name="DOCSIS"     code="1"/>
+                       <enum name="xDSL"       code="2"/>
+                       <enum name="WiMAX"      code="3"/>
+                       <enum name="3GPP2"      code="4"/>
+                       <enum name="3GPP-EPS"   code="5"/>
+               </avp>
+               <avp name="QoS-Class-Identifier" code="1028" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="QCI_1"      code="1"/>
+                       <enum name="QCI_2"      code="2"/>
+                       <enum name="QCI_3"      code="3"/>
+                       <enum name="QCI_4"      code="4"/>
+                       <enum name="QCI_5"      code="5"/>
+                       <enum name="QCI_6"      code="6"/>
+                       <enum name="QCI_7"      code="7"/>
+                       <enum name="QCI_8"      code="8"/>
+                       <enum name="QCI_9"      code="9"/>
+                       <!-- The values shall be used to indicate standardized characteristics associated with standardized QCI values from
+                               3GPP TS 23.203 -->
+               </avp>
+               <avp name="QoS-Negotiation" code="1029" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="NO_QoS_NEGOTIATION"                         code="0"/>
+                       <enum name="QoS_NEGOTIATION_SUPPORTED"  code="1"/>
+               </avp>
+               <avp name="QoS-Upgrade" code="1030" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="QoS_UPGRADE_NOT_SUPPORTED"                  code="0"/>
+                       <enum name="QoS_UPGRADE_SUPPORTED"      code="1"/>
+               </avp>
+               <avp name="Rule-Failure-Code" code="1031" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="UNKNOWN_RULE_NAME"                  code="1"/>
+                       <enum name="RATING_GROUP_ERROR"                         code="2"/>
+                       <enum name="SERVICE_IDENTIFIER_ERROR"   code="3"/>
+                       <enum name="GW/PCEF_MALFUNCTION"                code="4"/>
+                       <enum name="RESOURCES_LIMITATION"                       code="5"/>
+                       <enum name="MAX_NR_BEARERS_REACHED"             code="6"/>
+                       <enum name="UNKNOWN_BEARER_ID"          code="7"/>
+                       <enum name="MISSING_BEARER_ID"          code="8"/>
+                       <enum name="MISSING_FLOW_DESCRIPTION"           code="9"/>
+                       <enum name="RESOURCE_ALLOCATION_FAILURE"                        code="10"/>
+                       <enum name="UNSUCCESSFUL_QOS_VALIDATION"                        code="11"/>
+               </avp>
+               <avp name="RAT-Type" code="1032" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated" />
+                       <enum name="WLAN" code="0" />
+                       <enum name="UTRAN" code="1000" />
+                       <enum name="GERAN" code="1001" />
+                       <enum name="GAN" code="1002" />
+                       <enum name="HSPA_EVOLUTION" code="1003" />
+                       <enum name="EUTRAN" code="1004" />
+                       <enum name="CDMA2000_1X" code="2000" />
+                       <enum name="HRPD" code="2001" />
+                       <enum name="UMB" code="2002" />
+               </avp>
+               <avp name="Event-Report-Indication" code="1033" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Event-Trigger"/>
+                               <gavp name="RAT-Type"/>
+                               <gavp name="QoS-Information"/>
+                               <gavp name="RAI"/>
+                               <gavp name="3GPP-User-Location-Info"/>
+                       </grouped>
+               </avp>
+               <avp name="Allocation-Retention-Priority" code="1034" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Priority-Level"/>
+                               <gavp name="Pre-emption-Capability"/>
+                               <gavp name="Pre-emption-Vulnerability"/>
+                       </grouped>
+               </avp>
+               <avp name="CoA-IP-Address" code="1035" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="IPAddress"/>
+               </avp>
+               <avp name="Tunnel-Header-Filter" code="1036" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="IPFilterRule"/>
+               </avp>
+               <avp name="Tunnel-Header-Length" code="1037" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Unsigned32"/>
-                       <enum name="Authenticate Only" code="1"/>
-                       <enum name="Authorize Only" code="2"/>
-                       <enum name="Authorize Authenticate" code="3"/>
                </avp>
-               <avp name="Alternate-Peer" code="275" mandatory="must" protected="mustnot" may-encrypt="no" vendor-bit="mustnot">
-                       <type type-name="DiameterIdentity"/>
+               <avp name="Tunnel-Information" code="1038" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Tunnel-Header-Length"/>
+                               <gavp name="Tunnel-Header-Filter"/>
+                       </grouped>
                </avp>
-               <avp name="Auth-Grace-Period" code="276" mandatory="must" may-encrypt="no" vendor-bit="mustnot">
+               <avp name="CoA-Information" code="1039" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Tunnel-Information"/>
+                               <gavp name="CoA-IP-Address"/>
+                       </grouped>
+               </avp>
+               <avp name="APN-Aggregate-Max-Bitrate-DL" code="1040" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Unsigned32"/>
                </avp>
-               <avp name="Auth-Session-State" code="277" mandatory="must" may-encrypt="no" vendor-bit="mustnot">
+               <avp name="APN-Aggregate-Max-Bitrate-UL" code="1041" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Unsigned32"/>
-                       <enum name="STATE_MAINTAINED" code="0"/>
-                       <enum name="NO_STATE_MAINTAINED" code="1"/>
                </avp>
-               <avp name="Origin-State-Id" code="278" mandatory="must" protected="mustnot" vendor-bit="mustnot">
+               <avp name="Revalidation-Time" code="1042" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Time"/>
+               </avp>
+               <avp name="Rule-Activation-Time" code="1043" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Time"/>
+               </avp>
+               <avp name="Rule-DeActivation-Time" code="1044" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Time"/>
+               </avp>
+               <avp name="Session-Release-Cause" code="1045" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="UNSPECIFIED_REASON"                         code="0"/>
+                       <enum name="UE_SUBSCRIPTION_REASON"     code="1"/>
+                       <enum name="INSUFFICIENT_SERVER_RESOURCES"      code="2"/>
+               </avp>
+               <avp name="Priority-Level" code="1046" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Unsigned32"/>
                </avp>
-               <avp name="Failed-AVP" code="279" mandatory="must" may-encrypt="no" vendor-bit="mustnot">
+               <avp name="Pre-emption-Capability" code="1047" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="PRE-EMPTION_CAPABILITY_ENABLED"                     code="0"/>
+                       <enum name="PRE-EMPTION_CAPABILITY_DISABLED"    code="1"/>
+               </avp>
+               <avp name="Pre-emption-Vulnerability" code="1048" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="PRE-EMPTION_VULNERABILITY_ENABLED"                  code="0"/>
+                       <enum name="PRE-EMPTION_VULNERABILITY_DISABLED"         code="1"/>
+               </avp>
+               <avp name="Default-EPS-Bearer-QoS" code="1049" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
                        <grouped>
-                       
+                               <gavp name="QoS-Class-Identifier"/>
+                               <gavp name="Allocation-Retention-Priority"/>
                        </grouped>
-                       
                </avp>
-               <avp name="Proxy-Host" code="280" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot">
-                       <type type-name="DiameterIdentity"/>
+               <avp name="AN-GW-Address" code="1050" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="IPAddress"/>
                </avp>
-               <avp name="Error-Message" code="281" mandatory="must" protected="mustnot" may-encrypt="no" vendor-bit="mustnot">
-                       <type type-name="UTF8String"/>
+               <avp name="QoS-Rule-Install" code="1051" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="QoS-Rule-Definition"/>
+                               <gavp name="Tunnel-Information"/>
+                               <gavp name="Access-Network-Charging-Identifier-Value"/>
+                               <gavp name="Resource-Allocation-Notification"/>
+                       </grouped>
                </avp>
-               <avp name="Route-Record" code="282" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot">
-                       <type type-name="DiameterIdentity"/>
+               <avp name="QoS-Rule-Remove" code="1052" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="QoS-Rule-Name"/>
+                       </grouped>
                </avp>
-               <avp name="Destination-Realm" code="283" mandatory="must" protected="mustnot" may-encrypt="no" vendor-bit="mustnot">
-                       <type type-name="DiameterIdentity"/>
+               <avp name="QoS-Rule-Definition" code="1053" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="QoS-Rule-Name"/>
+                               <gavp name="Flow-Information"/>
+                               <gavp name="QoS-Information"/>
+                               <gavp name="Precedence"/>
+                       </grouped>
                </avp>
-               <avp name="Proxy-Info" code="284" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot">
+               <avp name="QoS-Rule-Name" code="1054" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="QoS-Rule-Report" code="1055" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
                        <grouped>
-                               <gavp name="Proxy-Host"/>
-                               <gavp name="Proxy-State"/>
+                               <gavp name="QoS-Rule-Name"/>
+                               <gavp name="PCC-Rule-Status"/>
+                               <gavp name="Rule-Failure-Code"/>
                        </grouped>
                </avp>
-               <avp name="Re-Auth-Request-Type" code="285" mandatory="must" may-encrypt="no" vendor-bit="mustnot">
-                       <type type-name="Unsigned32"/>
-                       <enum name="AUTHORIZE_ONLY" code="0"/>
-                       <enum name="AUTHORIZE_AUTHENTICATE" code="1"/>
+               <avp name="Security-Parameter-Index" code="1056" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
                </avp>
-               <avp name="Accounting-Sub-Session-Id" code="287" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="mustnot">
-                       <type type-name="Unsigned64"/>
+               <avp name="Flow-Label" code="1057" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
                </avp>
-<!-- 288-290    Unallocated http://www.iana.org/assignments/aaa-parameters (last updated 20 September 2005)?? -->
-               <avp name="Authorization-Lifetime" code="291" mandatory="must" may-encrypt="no" vendor-bit="mustnot">
-                       <type type-name="Integer32"/>
+               <avp name="Flow-Information" code="1058" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Flow-Description"/>
+                               <gavp name="Packet-Filter-Identifier"/>
+                               <gavp name="ToS-Traffic-Class"/>
+                               <gavp name="Security-Parameter-Index"/>
+                               <gavp name="Flow-Label"/>
+                       </grouped>
                </avp>
-               <avp name="Redirect-Host" code="292" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot">
-                       <type type-name="DiameterIdentity"/>
+               <avp name="Packet-Filter-Content" code="1059" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="IPFilterRule"/>
                </avp>
-               <avp name="Destination-Host" code="293" mandatory="must" protected="mustnot" may-encrypt="no" vendor-bit="mustnot">
-                       <type type-name="DiameterIdentity"/>
+               <avp name="Packet-Filter-Identifier" code="1060" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
                </avp>
-               <avp name="Error-Reporting-Host" code="294" mandatory="must" protected="mustnot" may-encrypt="no" vendor-bit="mustnot">
-                       <type type-name="DiameterIdentity"/>
+               <avp name="Packet-Filter-Information" code="1061" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Packet-Filter-Identifier"/>
+                               <gavp name="Precedence"/>
+                               <gavp name="Packet-Filter-Content"/>
+                               <gavp name="ToS-Traffic-Class"/>
+                               <gavp name="Security-Parameter-Index"/>
+                               <gavp name="Flow-Label"/>
+                       </grouped>
                </avp>
-               <avp name="Termination-Cause" code="295" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot">
-                       <type type-name="Unsigned32"/>
-                       <enum name="DIAMETER_LOGOUT" code="1"/>
-                       <enum name="DIAMETER_SERVICE_NOT_PROVIDED" code="2"/>
-                       <enum name="DIAMETER_BAD_ANSWER" code="3"/>
-                       <enum name="DIAMETER_ADMINISTRATIVE" code="4"/>
-                       <enum name="DIAMETER_LINK_BROKEN" code="5"/>
-                       <enum name="DIAMETER_AUTH_EXPIRED" code="6"/>
-                       <enum name="DIAMETER_USER_MOVED" code="7"/>
-                       <enum name="DIAMETER_SESSION_TIMEOUT" code="8"/>
+               <avp name="Packet-Filter-Operation" code="1062" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="DELETION"                   code="0"/>
+                       <enum name="ADDITION"   code="1"/>
+                       <enum name="MODIFICATION"       code="2"/>
                </avp>
-               <avp name="Origin-Realm" code="296" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot">
-                       <type type-name="DiameterIdentity"/>
+               <avp name="Resource-Allocation-Notification" code="1063" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="ENABLE_NOTIFICATION"  code="0"/>
                </avp>
-               <avp name="Experimental-Result" code="297" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot">
+               <avp name="Session-Linking-Indicator" code="1064" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="SESSION_LINKING_IMMEDIATE"  code="0"/>
+                       <enum name="SESSION_LINKING_DEFERRED"   code="1"/>
+               </avp>
+               <avp name="PDN-Connection-ID" code="1065" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Monitoring-Key" code="1066" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Usage-Monitoring-Information" code="1067" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
                        <grouped>
-                               <gavp name="Vendor-Id"/>
-                               <gavp name="Experimental-Result-Code"/>
+                               <gavp name="Monitoring-Key"/>
+                               <gavp name="Granted-Service-Unit"/>
+                               <gavp name="Used-Service-Unit"/>
+                               <gavp name="Usage-Monitoring-Level"/>
+                               <gavp name="Usage-Monitoring-Report"/>
+                               <gavp name="Usage-Monitoring-Support"/>
                        </grouped>
                </avp>
-               <!-- 3GPP TS 29.230 version 6.5.0 Release 6, ETSI TS 129 230 V6.5.0 (2005-09) -->
-               <avp name="Experimental-Result-Code" code="298" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot">
-                       <type type-name="Unsigned32"/>
-                       <enum name="DIAMETER_FIRST_REGISTRATION" code="2001"/>
-                       <enum name="DIAMETER_SUBSEQUENT_REGISTRATION" code="2002"/>
-                       <enum name="DIAMETER_UNREGISTERED_SERVICE" code="2003"/>
-                       <enum name="DIAMETER_SUCCESS_SERVER_NAME_NOT_STORED" code="2004"/>
-                       <enum name="SDIAMETER_SERVER_SELECTION" code="2005"/>
-                       <enum name="DIAMETER_USER_DATA_NOT_AVAILABLE" code="4100"/>
-                       <enum name="DIAMETER_PRIOR_UPDATE_IN_PROGRESS" code="4101"/>
-                       <enum name="DIAMETER_ERROR_OUT_OF_RESOURCES" code="4121"/>
-                       <enum name="DIAMETER_ERROR_USER_UNKNOWN" code="5001"/>
-                       <enum name="DIAMETER_ERROR_IDENTITIES_DONT_MATCH" code="5002"/>
-                       <enum name="DIAMETER_ERROR_IDENTITY_NOT_REGISTERED" code="5003"/>
-                       <enum name="DIAMETER_ERROR_ROAMING_NOT_ALLOWED" code="5004"/>
-                       <enum name="DIAMETER_ERROR_IDENTITY_ALREADY_REGISTERED" code="5005"/>
-                       <enum name="DIAMETER_ERROR_AUTH_SCHEME_NOT_SUPPORTED" code="5006"/>
-                       <enum name="DIAMETER_ERROR_IN_ASSIGNMENT_TYPE" code="5007"/>
-                       <enum name="DIAMETER_ERROR_TOO_MUCH_DATA" code="5008"/>
-                       <enum name="DIAMETER_ERROR_NOT_SUPPORTED_USER_DATA" code="5009"/>
-                       <enum name="DIAMETER_MISSING_USER_ID" code="5010"/>
-                       <enum name="DIAMETER_ERROR_FEATURE_UNSUPPORTED" code="5011"/>
-                       <enum name="DIAMETER_ERROR_USER_NO_WLAN_SUBSCRIPTION" code="5041"/>
-                       <enum name="DIAMETER_ERROR_W-APN_UNUSED_BY_USER" code="5042"/>
-                       <enum name="DIAMETER_ERROR_W-DIAMETER_ERROR_NO_ACCESS_INDEPENDENT_SUBSCRIPTION" code="5043"/>
-                       <enum name="DIAMETER_ERROR_USER_NO_W-APN_SUBSCRIPTION" code="5044"/>
-                       <enum name="DIAMETER_ERROR_USER_DATA_NOT_RECOGNIZED" code="5100"/>
-                       <enum name="DIAMETER_ERROR_OPERATION_NOT_ALLOWED" code="5101"/>
-                       <enum name="DIAMETER_ERROR_USER_DATA_CANNOT_BE_READ" code="5102"/>
-                       <enum name="DIAMETER_ERROR_USER_DATA_CANNOT_BE_MODIFIED" code="5103"/>
-                       <enum name="DIAMETER_ERROR_USER_DATA_CANNOT_BE_NOTIFIED" code="5104"/>
-                       <enum name="DIAMETER_ERROR_TRANSPARENT_DATA_OUT_OF_SYNC" code="5105"/>
-                       <enum name="DIAMETER_ERROR_START_INDICATION" code="5120"/>
-                       <enum name="DIAMETER_ERROR_STOP_INDICATION" code="5121"/>
-                       <enum name="DIAMETER_ERROR_UNKNOWN_MBMS_BEARER_SERVICE" code="5122"/>
-                       <enum name="DIAMETER_ERROR_SERVICE_AREA" code="5123"/>
-                       <enum name="DIAMETER_ERROR_INITIAL_PARAMETERS" code="5140"/>
-                       <enum name="DIAMETER_ERROR_TRIGGER_EVENT" code="5141"/>
+               <avp name="Usage-Monitoring-Level" code="1068" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="SESSION_LEVEL"  code="0"/>
+                       <enum name="PCC_RULE_LEVEL"   code="1"/>
+               </avp>
+               <avp name="Usage-Monitoring-Report" code="1069" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="USAGE_MONITORING_REPORT_REQUIRED"  code="0"/>
+               </avp>
+               <avp name="Usage-Monitoring-Support" code="1070" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="USAGE_MONITORING_DISABLED"  code="0"/>
+               </avp>
+               <avp name="CSG-Information-Reporting" code="1071" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="CHANGE_CSG_CELL"  code="0"/>
+                       <enum name="CHANGE_CSG_SUBSCRIBED_HYBRID_CELL"   code="1"/>
+                       <enum name="CHANGE_CSG_UNSUBSCRIBED_HYBRID_CELL"   code="2"/>
+               </avp>
+               <avp name="Packet-Filter-Usage" code="1072" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="SEND_TO_UE"  code="0"/>
+               </avp>
+               <avp name="Flow-Direction" code="1073" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="UNSPECIFIED"  code="0"/>
+                       <enum name="DOWNLINK"   code="1"/>
+                       <enum name="UPLINK"   code="2"/>
+                       <enum name="BIDIRECTIONAL"   code="3"/>
+               </avp>
+               <avp name="QoS-Rule-Base-Name" code="1074" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                 <type type-name="UTF8String"/>
+               </avp>
+
+<!-- Note: The AVP codes from 1072 to 1099 are reserved for TS 29.212 -->
+<!-- ETSI TS 129 140 V6.3.0 (2005-12) -->
+               <avp name="Served-User-Identity" code="1100" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="MSISDN"/>
+                               <gavp name="VASP-ID"/>
+                               <gavp name="VAS-ID"/>
+                       </grouped>
+               </avp>
+               <avp name="VASP-ID" code="1101" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="VAS-ID" code="1102" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="Trigger-Event" code="1103" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="MM1 Message Submission, Profile based" code="0"/>
+                       <enum name="MM1 Message Submission, Address based" code="1"/>
+                       <enum name="MM1 Message Delivery" code="2"/>
+                       <enum name="MM7 Message Submission, Profile based" code="3"/>
+                       <enum name="MM7 Message Submission, Address based" code="4"/>
+               </avp>
+               <avp name="Sender-Address" code="1104" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="Initial-Recipient-Address" code="1105" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Sequence-Number"/>
+                               <gavp name="Recipient-Address"/>
+                       </grouped>
                </avp>
-               <!-- RFC3588 AVP -->   
-               <avp name="Inband-Security-Id" code="299" mandatory="must" may-encrypt="no" protected="may" vendor-bit="mustnot">   
-                       <type type-name="Unsigned32"/>   
-                               <enum name="NO_INBAND_SECURITY" code="0"/>   
-                               <enum name="TLS" code="1"/>   
-               </avp> 
-
-               <avp name="E2E-Sequence" code="300" mandatory="must">
+               <avp name="Result-Recipient-Address" code="1106" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
                        <grouped>
-                               <gavp name="foo"/>
+                               <gavp name="Sequence-Number"/>
+                               <gavp name="Recipient-Address"/>
+                               <gavp name="Routeing-Address"/>
+                               <gavp name="Sender-Address"/>
                        </grouped>
                </avp>
-               <!-- 301-317    Unallocated -->
-<!-- AVP:s 318 - 348 Belongs to Diameter Mobile IPv4 Application and is defined in mobileipv4.xml --> 
-<!-- AVP:s 349-362        Unassigned -->
-<!-- AVP:s 363 - 408 Belongs to Diameter Network Access Server Application and is defined in nasreq.xml -->
-<!-- AVP:s 411 - 461 Belongs to Carge Control and is defined in chargecontrol.xml --> 
-<!-- 466-479    Unallocated -->
-               <avp name="Accounting-Record-Type" code="480" mandatory="must" may-encrypt="yes" vendor-bit="mustnot">
+               <avp name="Sequence-Number" code="1107" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Unsigned32"/>
+               </avp>
+               <avp name="Recipient-Address" code="1108" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="Routeing-Address" code="1109" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="Originating-Interface" code="1110" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Enumerated"/>
-                       <enum name="Event Record" code="1"/>
-                       <enum name="Start Record" code="2"/>
-                       <enum name="Interim Record" code="3"/>
-                       <enum name="Stop Record" code="4"/>
+                       <enum name="MM1" code="0"/>
+                       <enum name="MM3" code="1"/>
+                       <enum name="MM4" code="2"/>
+                       <enum name="MM7" code="3"/>
                </avp>
-<!-- 481-482    Unallocated -->
-
-               <avp name="Accounting-Realtime-Required" code="483" mandatory="must" may-encrypt="yes" vendor-bit="mustnot">
-                       <type type-name="Unsigned32"/>
-                       <enum name="Reserved" code="0"/>
-                       <enum name="DELIVER_AND_GRANT" code="1"/>
-                       <enum name="GRANT_AND_STORE" code="2"/>
-                       <enum name="GRANT_AND_LOSE" code="3"/>
+               <avp name="Delivery-Report" code="1111" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="No Delivery Report Requested" code="0"/>
+                       <enum name="Delivery Report Requested" code="1"/>
                </avp>
-<!-- 484    unallocated  -->
-               <avp name="Accounting-Record-Number" code="485" mandatory="must" may-encrypt="yes" vendor-bit="mustnot">
-                       <type type-name="Unsigned32"/>
+               <avp name="Read-Reply" code="1112" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="No Read Reply Requested" code="0"/>
+                       <enum name="Read Reply Requested" code="1"/>
                </avp>
-<!--
-486 MIP6-Agent-Info [RFC5447]    
-487 MIP-Careof-Address [RFC-ietf-dime-mip6-split-17] 
-488 MIP-Authenticator [RFC-ietf-dime-mip6-split-17] 
-489 MIP-MAC-Mobility-Data [RFC-ietf-dime-mip6-split-17] 
-490 MIP-Timestamp [RFC-ietf-dime-mip6-split-17] 
-491 MIP-MN-HA-SPI [RFC-ietf-dime-mip6-split-17] 
-492 MIP-MN-HA-MSA [RFC-ietf-dime-mip6-split-17] 
-493 Service-Selection [RFC-ietf-dime-mip6-split-17] 
-494 MIP6-Auth-Mode [RFC-ietf-dime-mip6-split-17] 
-
--->
-    <avp name="Example-AVP" code="999999" mandatory="mustnot" vendor-bit="may">
+               <avp name="Sender-Visibility" code="1113" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="Sender Identification requested not to be hidden" code="0"/>
+                       <enum name="Sender Identification requested to be hidden" code="1"/>
+               </avp>
+               <avp name="Service-Key" code="1114" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="Billing-Information" code="1115" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="Status" code="1116" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
                        <grouped>
-                               <gavp name="Origin-Host"/>
-                               <gavp name="Host-IP-Address"/>
+                               <gavp name="Status-Code"/>
+                               <gavp name="Status-Text"/>
                        </grouped>
                </avp>
-               <!-- ************************ END DIAMETER BASE PROTOCOL AVPS ******************* -->
-<!--
-3GPP TS 29.230 version 8.4.0 Release 8  Table 7.1: 3GPP specific AVP codes
-100 3GPP-WLAN-APN-Id OctetString 29.234 [6]
-Note: The AVP codes from 1 to 255 are reserved for backwards compatibility with 3GPP RADIUS Vendor
-Specific Attributes (See TS 29.061 [13])
-Note: The AVP codes from 256 to 299 are reserved for future use.
-300 Authentication-Method Enumerated
-301 Authentication-Information-SIM OctetString
-302 Authorization -Information-SIM OctetString
-303 WLAN-User-Data Grouped
-304 Charging-Data Grouped
-305 WLAN-Access Enumerated
-306 WLAN- 3GPP-IP-Access Enumerated
-307 APN-Authorized Grouped
-308 APN-Id
-309 APN-Barring-Type Enumerated
-310 WLAN-Direct-IP-Access Enumerated
-311 Session-Request-Type Enumerated
-312 Routing-Policy IPFilterRule
-313 Max-Requested-Bandwidth OctetString
-314 Charging-Characteristics Integer
-315 Charging-Nodes Grouped
-316 Primary-OCS-Charging-Function-Name DiameterIdentity
-317 Secondary-OCS-Charging-Function-Name DiameterIdentity
-318 3GPP-AAA-Server-Name DiameterIdentity 29.234 [6]
-319 Maximum-Number-Accesses Unsigned32
-Note: The AVP codes from 320 to 399 are reserved for TS 29.234
--->
-               <avp name="GBA-UserSecSettings" code="400" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
-                       <type type-name="OctetString"/>
+               <avp name="Status-Code" code="1117" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
                </avp>
-
-               <avp name="Transaction-Identifier" code="401" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
-                       <type type-name="OctetString"/>
+               <avp name="Status-Text" code="1118" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
                </avp>
-               <avp name="NAF-Hostname" code="402" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
-                       <type type-name="OctetString"/>
+               <avp name="Routeing-Address-Resolution" code="1119" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="unresolved" code="0"/>
+                       <enum name="resolved" code="1"/>
                </avp>
-               <avp name="GAA-Service-Identifier" code="403" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
-                       <type type-name="OctetString"/>
+<!-- 29.140 [16]
+Note: The AVP codes from 1119 to 1199 are reserved for TS 29.140
+32.299
+-->
+               <avp name="Domain-Name" code="1200" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
                </avp>
-               <avp name="Key-ExpiryTime" code="404" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
-                       <type type-name="Time"/>
+               <avp name="Recipient-Address" code="1201" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Address-Type"/>
+                               <gavp name="Address-Data"/>
+                               <gavp name="Address-Domain"/>
+                               <gavp name="Addressee-Type"/>
+                       </grouped>
                </avp>
-               <avp name="ME-Key-Material" code="405" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
-                       <type type-name="OctetString"/>
+               <avp name="Submission-Time" code="1202" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Time"/>
                </avp>
-               <avp name="UICC-Key-Material" code="406" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
-                       <type type-name="OctetString"/>
+               <avp name="MM-Content-Type" code="1203" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Type-Number"/>
+                               <gavp name="Additional-Type-Information"/>
+                               <gavp name="Content-Size"/>
+                               <gavp name="Additional-Content-Information"/>
+                       </grouped>
                </avp>
-               <avp name="GBA_U-Awareness-Indicator" code="407" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+<!-- The Type-Number AVP (AVP code1204) is of type Enumerated and identifies the well-known -->
+<!-- media types. The values are taken from OMNA WSP Content Type Codes database -->
+<!-- http://www.openmobilealliance.org/tech/omna/omna-wsp-content-type.aspx -->
+               <avp name="Type-Number" code="1204" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Enumerated"/>
-                       <enum name="NO" code="0"/>
-                       <enum name="YES" code="1"/>
+                       <enum name="*/*" code="0"/>
+                       <enum name="text/*" code="1"/>
+                       <enum name="text/html" code="2"/>
+                       <enum name="text/plain" code="3"/>
+                       <enum name="text/x-hdml" code="4"/>
+                       <enum name="text/x-ttml" code="5"/>
+                       <enum name="text/x-vCalendar" code="6"/>
+                       <enum name="text/x-vCard" code="7"/>
+                       <enum name="text/vnd.wap.wml" code="8"/>
+                       <enum name="text/vnd.wap.wmlscript" code="9"/>
+                       <enum name="text/vnd.wap.wta-event" code="10"/>
+                       <enum name="multipart/*" code="11"/>
+                       <enum name="multipart/mixed" code="12"/>
+                       <enum name="multipart/form-data" code="13"/>
+                       <enum name="multipart/byterantes" code="14"/>
+                       <enum name="multipart/alternative" code="15"/>
+                       <enum name="application/*" code="16"/>
+                       <enum name="application/java-vm" code="17"/>
+                       <enum name="application/x-www-form-urlencoded" code="18"/>
+                       <enum name="application/x-hdmlc" code="19"/>
+                       <enum name="application/vnd.wap.wmlc" code="20"/>
+                       <enum name="application/vnd.wap.wmlscriptc" code="21"/>
+                       <enum name="application/vnd.wap.wta-eventc" code="22"/>
+                       <enum name="application/vnd.wap.uaprof" code="23"/>
+                       <enum name="application/vnd.wap.wtls-ca-certificate" code="24"/>
+                       <enum name="application/vnd.wap.wtls-user-certificate" code="25"/>
+                       <enum name="application/x-x509-ca-cert" code="26"/>
+                       <enum name="application/x-x509-user-cert" code="27"/>
+                       <enum name="image/*" code="28"/>
+                       <enum name="image/gif" code="29"/>
+                       <enum name="image/jpeg" code="30"/>
+                       <enum name="image/tiff" code="31"/>
+                       <enum name="image/png" code="32"/>
+                       <enum name="image/vnd.wap.wbmp" code="33"/>
+                       <enum name="application/vnd.wap.multipart.*" code="34"/>
+                       <enum name="application/vnd.wap.multipart.mixed" code="35"/>
+                       <enum name="application/vnd.wap.multipart.form-data" code="36"/>
+                       <enum name="application/vnd.wap.multipart.byteranges" code="37"/>
+                       <enum name="application/vnd.wap.multipart.alternative" code="38"/>
+                       <enum name="application/xml" code="39"/>
+                       <enum name="text/xml" code="40"/>
+                       <enum name="application/vnd.wap.wbxml" code="41"/>
+                       <enum name="application/x-x968-cross-cert" code="42"/>
+                       <enum name="application/x-x968-ca-cert" code="43"/>
+                       <enum name="application/x-x968-user-cert" code="44"/>
+                       <enum name="text/vnd.wap.si" code="45"/>
+                       <enum name="application/vnd.wap.sic" code="46"/>
+                       <enum name="text/vnd.wap.sl" code="47"/>
+                       <enum name="application/vnd.wap.slc" code="48"/>
+                       <enum name="text/vnd.wap.co" code="49"/>
+                       <enum name="application/vnd.wap.coc" code="50"/>
+                       <enum name="application/vnd.wap.multipart.related" code="51"/>
+                       <enum name="application/vnd.wap.sia" code="52"/>
+                       <enum name="text/vnd.wap.connectivity-xml" code="53"/>
+                       <enum name="application/vnd.wap.connectivity-wbxml" code="54"/>
+                       <enum name="application/pkcs7-mime" code="55"/>
+                       <enum name="application/vnd.wap.hashed-certificate" code="56"/>
+                       <enum name="application/vnd.wap.signed-certificate" code="57"/>
+                       <enum name="application/vnd.wap.cert-response" code="58"/>
+                       <enum name="application/xhtml+xml" code="59"/>
+                       <enum name="application/wml+xml" code="60"/>
+                       <enum name="text/css" code="61"/>
+                       <enum name="application/vnd.wap.mms-message" code="62"/>
+                       <enum name="application/vnd.wap.rollover-certificate" code="63"/>
+                       <enum name="application/vnd.wap.locc+wbxml" code="64"/>
+                       <enum name="application/vnd.wap.loc+xml" code="65"/>
+                       <enum name="application/vnd.syncml.dm+wbxml" code="66"/>
+                       <enum name="application/vnd.syncml.dm+xml" code="67"/>
+                       <enum name="application/vnd.syncml.notification" code="68"/>
+                       <enum name="application/vnd.wap.xhtml+xml" code="69"/>
+                       <enum name="application/vnd.wv.csp.cir" code="70"/>
+                       <enum name="application/vnd.oma.dd+xml" code="71"/>
+                       <enum name="application/vnd.oma.drm.message" code="72"/>
+                       <enum name="application/vnd.oma.drm.content" code="73"/>
+                       <enum name="application/vnd.oma.drm.rights+xml" code="74"/>
+                       <enum name="application/vnd.oma.drm.rights+wbxml" code="75"/>
+                       <enum name="application/vnd.wv.csp+xml" code="76"/>
+                       <enum name="application/vnd.wv.csp+wbxml" code="77"/>
+                       <enum name="application/vnd.syncml.ds.notification" code="78"/>
+                       <enum name="audio/*" code="79"/>
+                       <enum name="video/*" code="80"/>
+                       <enum name="application/vnd.oma.dd2+xml" code="81"/>
+                       <enum name="application/mikey" code="82"/>
+                       <enum name="application/vnd.oma.dcd" code="83"/>
+                       <enum name="application/vnd.oma.dcdc" code="84"/>
                </avp>
-               <avp name="BootstrapInfoCreationTime" code="408" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
-                       <type type-name="Time"/>
+               <avp name="Additional-Type-Information" code="1205" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
                </avp>
-               <avp name="GUSS-Timestamp" code="409" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
-                       <type type-name="Time"/>
+               <avp name="Content-Size" code="1206" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Unsigned32"/>
                </avp>
-               <avp name="GBA-Type" code="410" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+               <avp name="Additional-Content-Information" code="1207" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Type-Number"/>
+                               <gavp name="Additional-Type-Information"/>
+                               <gavp name="Content-Size"/>
+                       </grouped>
+               </avp>
+               <avp name="Addressee-Type" code="1208" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Enumerated"/>
-                       <enum name="3G GBA" code="0"/>
-                       <enum name="2G GBA" code="1"/>
+                       <enum name="TO" code="0"/>
+                       <enum name="CC" code="1"/>
+                       <enum name="BCC" code="2"/>
                </avp>
-<!--
-400 GBA-UserSecSettings OctedString
-401 Transaction-Identifier OctetString
-402 NAF-Hostname OctetString
-403 GAA-Service-Identifier OctedString
-404 Key-ExpiryTime Time
-405 ME-Key-Material OctedString
-406 UICC-Key-Material OctedString
-407 GBA_U-Awareness-Indicator Enumerated
-408 BootstrapInfoCreationTime Time
-409 GUSS-Timestamp Time
-410 GBA-Type Enumerated
-411 UE-Id OctectString
-412 UE-Id-Type Enumerated
-413 UICC-App-Label OctectString
-414 UICC-ME Enumerated
-415 Requested-Key-Lifetime Time
-416 Private-Identity-Request Enumerated
-417 GBA-Push-Info OctectString
-418 NAF-SA-Identifier OctectString
-29.109 [7]
-Note: TThe AVP codes from 419 to 499 are reserved for TS 29.109
--->
-<!-- Ref 3GPP TS 29.209 version 6.7.0 Release 6 
- NOTE AVP 500 - 523 is in gqpolicy.xml
-      AVP 524 - 527 is in TGPPRx.xml (3GPP TS 29.214)
-Note: The AVP codes from 524 to 599 are reserved for TS 29.209 and TS 29.211
--->
-               <avp name="Visited-Network-Identifier" code="600" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
-                       <type type-name="OctetString"/>
+               <avp name="Priority" code="1209" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="Low" code="0"/>
+                       <enum name="Normal" code="1"/>
+                       <enum name="High" code="2"/>
                </avp>
-               <avp name="Public-Identity" code="601" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+               <avp name="Message-ID" code="1210" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="UTF8String"/>
                </avp>
-    <avp name="Server-Name" code="602" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
-      <type type-name="UTF8String"/>
-    </avp>    
-<!--
-603 Server-Capabilities Grouped
-604 Mandatory-Capability Unsigned32
-605 Optional-Capability Unsigned32
-606 User-Data OctetString
-607 SIP-Number-Auth-Items Unsigned32
-608 SIP-Authentication-Scheme UTF8String
-609 SIP-Authenticate OctetString
-610 SIP-Authorization OctetString
-611 SIP-Authentication-Context OctetString
-612 SIP-Auth-Data-Item Grouped
-613 SIP-Item-Number Unsigned32
-614 Server-Assignment-Type Enumerated
-615 Deregistration-Reason Grouped
-616 Reason-Code Enumerated
-617 Reason-Info UTF8String
-
--->
-               <avp name="Charging-Information" code="618" vendor-id="TGPP" mandatory="must" may-encrypt="no" vendor-bit="must">
+               <avp name="Message-Type" code="1211" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="m-send-req" code="1"/>
+                       <enum name="m-send-conf" code="2"/>
+                       <enum name="m-notification-ind" code="3"/>
+                       <enum name="m-notifyresp-ind" code="4"/>
+                       <enum name="m-retrieve-conf" code="5"/>
+                       <enum name="m-acknowledge-ind" code="6"/>
+                       <enum name="m-delivery-ind" code="7"/>
+                       <enum name="m-read-rec-ind" code="8"/>
+                       <enum name="m-read-orig-ind" code="9"/>
+                       <enum name="m-forward-req" code="10"/>
+                       <enum name="m-forward-conf" code="11"/>
+                       <enum name="m-mbox-store-conf" code="12"/>
+                       <enum name="m-mbox-view-conf" code="13"/>
+                       <enum name="m-mbox-upload-conf" code="14"/>
+                       <enum name="m-mbox-delete-conf" code="15"/>
+               </avp>
+               <avp name="Message-Size" code="1212" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Unsigned32"/>
+               </avp>
+               <avp name="Message-Class" code="1213" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
                        <grouped>
-                               <gavp name="Primary-Event-Charging-Function-Name"/>
-                               <gavp name="Secondary-Event-Charging-Function-Name"/>
-                               <gavp name="Primary-Charging-Collection-Function-Name"/>
-                               <gavp name="Secondary-Charging-Collection-Function-Name"/>
+                               <gavp name="Class-Identifier"/>
+                               <gavp name="Token-Text"/>
                        </grouped>
-               </avp>          
-               
-               <avp name="Primary-Event-Charging-Function-Name" code="619" vendor-id="TGPP" mandatory="must" may-encrypt="no" vendor-bit="must">
-                       <type type-name="UTF8String"/>
                </avp>
-               
-               <avp name="Secondary-Event-Charging-Function-Name" code="620" vendor-id="TGPP" mandatory="must" may-encrypt="no" vendor-bit="must">
+               <avp name="Class-Identifier" code="1214" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="Personal" code="0"/>
+                       <enum name="Advertisement" code="1"/>
+                       <enum name="Informational" code="2"/>
+                       <enum name="Auto" code="3"/>
+               </avp>
+               <avp name="Token-Text" code="1215" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="UTF8String"/>
                </avp>
-               
-               <avp name="Primary-Charging-Collection-Function-Name" code="621" vendor-id="TGPP" mandatory="must" may-encrypt="no" vendor-bit="must">
+               <avp name="Delivery-Report-Requested" code="1216" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="No" code="0"/>
+                       <enum name="Yes" code="1"/>
+               </avp>
+               <avp name="Adaptations" code="1217" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="No" code="0"/>
+                       <enum name="Yes" code="1"/>
+               </avp>
+               <avp name="Applic-ID" code="1218" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="UTF8String"/>
                </avp>
-               
-               <avp name="Secondary-Charging-Collection-Function-Name" code="622" vendor-id="TGPP" mandatory="must" may-encrypt="no" vendor-bit="must">
+               <avp name="Aux-Applic-Info" code="1219" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="UTF8String"/>
                </avp>
-<!--
-623 User-Authorization-Type Enumerated
-624 User-Data-Already-Available Enumerated
-625 Confidentiality-Key OctetString
-626 Integrity-Key OctetString
-627 User-Data-Request-Type Enumerated
-628 Supported-Features Grouped
-629 Feature-List-ID Unsigned32
-630 Feature-List Unsigned32
-631 Supported-Applications Grouped
-632 Associated-Identities Grouped
-633 Originating-Request Enumerated
-634 Wildcarded-PSI UTF8String
-635    SIP-Digest-Authenticate Grouped 
-636    Wildcarded-IMPU UTF8String      
-637    UAR-Flags       Unsigned32      
-638    Loose-Route-Indication  Enumerated      
-639    SCSCF-Restoration-Info  Grouped 
-640    Path    OctetString     
-641    Contact OctetString     
-642    Subscription-Info       Grouped 
-643    Call-ID-SIP-Header      OctetString     
-644    From-SIP-Header OctetString     
-645    To-SIP-Header   OctetString     
-646    Record-Route    OctetString     
-647    Associated-Registered-Identities        Grouped
-648 Multiple-Registration-Indication Enumerated
-649 Restoration-Info Grouped
-Note: The AVP codes from 650 to 699 are reserved for TS 29.229.
- ************************** 3GPP Sh AVPS        **************************
- ************************** NOTE see TGPPSh.xml **************************
- ************************** 3GPP TS 29.329      **************************
- **************************      700 - 711         **************************
-Note: The AVP codes from 711 to799 are reserved for TS 29.329.
-Note: The AVP codes from 800 to 822 are reserved for TS 32.299.
--->
-               <!-- 3GPP Diameter charging applications (3GPP TS 32.299 version 7.0.0 Release 7)-->
-               <!-- Note: The AVP codes from 800 to 822 are reserved for TS 32.299. -->
-               <avp name="Event-Type" code="823" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot" vendor-id="TGPP" >
-                       <grouped>
-                               <gavp name="SIP-Method"/>
-                               <gavp name="Event"/>
-                               <gavp name="Content-Type"/>
-                               <gavp name="Content-Length"/>
-                               <gavp name="Content-Disposition"/>
-                       </grouped>
+               <avp name="Content-Class" code="1220" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="text" code="0"/>
+                       <enum name="image-basic" code="1"/>
+                       <enum name="image-rich" code="2"/>
+                       <enum name="video-basic" code="3"/>
+                       <enum name="video-rich" code="4"/>
+                       <enum name="megapixel" code="5"/>
+                       <enum name="content-basic" code="6"/>
+                       <enum name="content-rich" code="7"/>
+               </avp>
+               <avp name="DRM-Content" code="1221" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="No" code="0"/>
+                       <enum name="Yes" code="1"/>
                </avp>
-               <avp name="SIP-Method" code="824" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
-                       <type type-name="UTF8String"/>
+               <avp name="Read-Reply-Report-Requested" code="1222" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="No" code="0"/>
+                       <enum name="Yes" code="1"/>
                </avp>
-               <avp name="Event" code="825" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
+               <avp name="Reply-Applic-ID" code="1223" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="UTF8String"/>
                </avp>
-               <avp name="Content-Type" code="826" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
-                       <type type-name="UTF8String"/>
+               <avp name="File-Repair-Supported" code="1224" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="SUPPORTED" code="1"/>
+                       <enum name="NOT_SUPPORTED" code="2"/>
+               </avp>
+               <avp name="MBMS-User-Service-Type" code="1225" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="DOWNLOAD" code="1"/>
+                       <enum name="STREAMING" code="2"/>
                </avp>
-               <!-- In 3GPP TS 32.299 version 6.5.0 Release 6 (2005-12)                                        -->
-               <!-- type type-name="UTF8String"                                                                                        -->
-               <!-- but according to 3GPP TS 32.299 version 7.4.0 Release 7(2006-12) it        -->
-               <!-- should be:                                                                                                                         -->
-               <avp name="Content-Length" code="827" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
+               <avp name="Unit-Quota-Threshold" code="1226" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Unsigned32"/>
                </avp>
-               <avp name="Content-Disposition" code="828" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
-                       <type type-name="UTF8String"/>
+               <avp name="PDP-Address" code="1227" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="IPAddress"/>
                </avp>
-               <avp name="Role-Of-Node" code="829" mandatory="must" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
-                       <type type-name="Enumerated"/>
-                       <enum name="ORIGINATING_ROLE" code="0"/>
-                       <enum name="TERMINATING_ROLE" code="1"/>
-                       <enum name="PROXY_ROLE" code="2"/>
-                       <enum name="B2BUA_ROLE" code="3"/>
+               <avp name="SGSN-Address" code="1228" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="IPAddress"/>
                </avp>
-               <avp name="User-Session-Id" code="830" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
+               <avp name="PoC-Session-Id" code="1229" mandatory="must" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="UTF8String"/>
                </avp>
-               <avp name="Calling-Party-Address" code="831" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
+               <avp name="Deferred-Location-Event-Type" code="1230" mandatory="must"  may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="UTF8String"/>
                </avp>
-               <avp name="Called-Party-Address" code="832" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
+               <avp name="LCS-APN" code="1231" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="UTF8String"/>
                </avp>
-               <avp name="Time-Stamps" code="833" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
+               <avp name="LCS-Client-ID" code="1232" mandatory="may" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
                        <grouped>
-                               <gavp name="SIP-Request-Timestamp"/>
-                               <gavp name="SIP-Response-Timestamp"/>
+                               <gavp name="LCS-Client-Type"/>
+                               <gavp name="LCS-Client-External-ID"/>
+                               <gavp name="LCS-Client-Dialed-By-MS"/>
+                               <gavp name="LCS-Client-Name"/>
+                               <gavp name="LCS-APN"/>
+                               <gavp name="LCS-Requestor-ID"/>
                        </grouped>
                </avp>
-               <avp name="SIP-Request-Timestamp" code="834" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
-                       <type type-name="Time"/>
-               </avp>
-               <avp name="SIP-Response-Timestamp" code="835" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
-                       <type type-name="Time"/>
-               </avp>
-               <avp name="Application-Server" code="836" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
+               <avp name="LCS-Client-Dialed-By-MS" code="1233" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="UTF8String"/>
                </avp>
-               <avp name="Application-provided-Called-Party-Address" code="837" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
+               <avp name="LCS-Client-External-ID" code="1234" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="UTF8String"/>
                </avp>
-               <avp name="Inter-Operator-Identifier" code="838" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
+               <avp name="LCS-Client-Name" code="1235" mandatory="may"  vendor-bit="must" vendor-id="TGPP">
                        <grouped>
-                               <gavp name="Originating-IOI"/>
-                               <gavp name="Terminating-IOI"/>
+                               <gavp name="LCS-Data-Coding-Scheme"/>
+                               <gavp name="LCS-Name-String"/>
+                               <gavp name="LCS-Format-Indicator"/>
                        </grouped>
                </avp>
-               <avp name="Originating-IOI" code="839" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
-                       <type type-name="UTF8String"/>
-               </avp>
-               <avp name="Terminating-IOI" code="840" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
+               <avp name="LCS-Data-Coding-Scheme" code="1236" mandatory="must" may-encrypt="yes" protected="may"  vendor-bit="must" vendor-id="TGPP">
                        <type type-name="UTF8String"/>
                </avp>
-               <avp name="IMS-Charging-Identifier " code="841" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
-                       <type type-name="UTF8String"/>
+               <avp name="LCS-Format-Indicator" code="1237" mandatory="may"  vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="LOGICAL_NAME" code="0"/>
+                       <enum name="EMAIL_ADDRESS" code="1"/>
+                       <enum name="MSISDN" code="2"/>
+                       <enum name="URL" code="3"/>
+                       <enum name="SIP_URL" code="4"/>
                </avp>
-               <avp name="SDP-Session-Description" code="842" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
+               <avp name="LCS-Name-String" code="1238" mandatory="must" may-encrypt="yes" protected="may"  vendor-bit="must" vendor-id="TGPP">
                        <type type-name="UTF8String"/>
                </avp>
-               <avp name="SDP-Media-components" code="843" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
+               <avp name="LCS-Requestor-ID" code="1239" mandatory="may" vendor-bit="must" vendor-id="TGPP">
                        <grouped>
-                               <gavp name="SDP-Media-Name"/>
-                               <gavp name="SDP-Media-Description"/>
+                               <gavp name="LCS-Data-Coding-Scheme"/>
+                               <gavp name="LCS-Requestor-ID-String"/>
                        </grouped>
                </avp>
-               <avp name="SDP-Media-Name" code="844" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
-                       <type type-name="UTF8String"/>
-               </avp>
-               <avp name="SDP-Media-Description" code="845" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
-                       <type type-name="UTF8String"/>
-               </avp>
-               <avp name="GPRS-Charging-ID" code="846" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
+               <avp name="LCS-Requestor-ID-String" code="1240" mandatory="must" may-encrypt="yes" protected="may"  vendor-bit="must" vendor-id="TGPP">
                        <type type-name="UTF8String"/>
                </avp>
-    <!--
-    ETSI TS 132 299 V7.6.0 (2007-06) 
-    -->  
-               <avp name="GGSN-Address" code="847" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
-                       <type type-name="IPAddress"/>
-               </avp>
-               <avp name="Served-Party-IP-Address" code="848" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
-                       <type type-name="IPAddress"/>
+               <avp name="LCS-Client-Type" code="1241" mandatory="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="EMERGENCY_SERVICES" code="0"/>
+                       <enum name="VALUE_ADDED_SERVICES" code="1"/>
+                       <enum name="PLMN_OPERATOR_SERVICES" code="2"/>
+                       <enum name="LAWFUL_INTERCEPT_SERVICES" code="3"/>
                </avp>
-               <avp name="Authorised-QoS" code="849" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
+               <avp name="Location-Estimate" code="1242" mandatory="must" may-encrypt="yes" protected="may"  vendor-bit="must" vendor-id="TGPP">
                        <type type-name="UTF8String"/>
                </avp>
-               <avp name="Application-Server-Information" code="850" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
-                       <grouped>
-                               <gavp name="Application-Server"/>
-                               <gavp name="Application-Provided-Called-Party-Address"/>
-                       </grouped>
+               <avp name="Location-Estimate-Type" code="1243" mandatory="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="CURRENT_LOCATION" code="0"/>
+                       <enum name="CURRENT_LAST_KNOWN_LOCATION" code="1"/>
+                       <enum name="INITIAL_LOCATION" code="2"/>
+                       <enum name="ACTIVATE_DEFERRED_LOCATION" code="3"/>
+                       <enum name="CANCEL_DEFERRED_LOCATION" code="4"/>
                </avp>
-               <avp name="Trunk-Group-ID" code="851" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
+               <avp name="Location-Type" code="1244" mandatory="may" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
                        <grouped>
-                               <gavp name="Incoming-Trunk-Group-ID"/>
-                               <gavp name="Outgoing-Trunk-Group-ID"/>
+                               <gavp name="Location-Estimate-Type"/>
+                               <gavp name="Deferred-Location-Event-Type"/>
                        </grouped>
                </avp>
-               <avp name="Incoming-Trunk-Group-ID" code="852" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
+               <avp name="Positioning-Data" code="1245" mandatory="must" may-encrypt="yes" protected="may"  vendor-bit="must" vendor-id="TGPP">
                        <type type-name="UTF8String"/>
                </avp>
-               <avp name="Outgoing-Trunk-Group-ID" code="853" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
+               <avp name="WLAN-Session-Id" code="1246" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="UTF8String"/>
                </avp>
-               <avp name="Bearer-Service" code="854" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
-                       <type type-name="OctetString"/>
+               <avp name="PDP-Context-Type" code="1247" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="PRIMARY" code="0"/>
+                       <enum name="SECONDARY" code="1"/>
                </avp>
-               <avp name="Service-ID" code="855" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
-                       <type type-name="UTF8String"/>
+               <avp name="MMBox-Storage-Requested" code="1248" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="No" code="0"/>
+                       <enum name="Yes" code="1"/>
                </avp>
-
-               <avp name="PoC-Controlling-Address" code="858" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+               <avp name="Service-Specific-Info" code="1249" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Service-Specific-Data"/>
+                               <gavp name="Service-Specific-Type"/>
+               </grouped>
+               </avp>
+               <avp name="Called-Asserted-Identity" code="1250" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="UTF8String"/>
                </avp>
-
-               <avp name="PoC-Group-Name" code="859" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+               <avp name="Requested-Party-Address" code="1251" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="UTF8String"/>
                </avp>
-
-               <avp name="Cause" code="860" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
+               <avp name="PoC-User-Role" code="1252" vendor-bit="must" vendor-id="TGPP">
                        <grouped>
-                               <gavp name="Cause-Code"/>
-                               <gavp name="Node-Functionality"/>
+                               <gavp name="PoC-User-Role-Ids"/>
+                               <gavp name="PoC-User-Role-info-Units"/>
                        </grouped>
                </avp>
-               <avp name="Cause-Code" code="861" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
-                       <type type-name="Enumerated"/>
-      <enum name="End of REGISTER dialog" code="-3"/>
-      <enum name="End of SUBSCRIBE dialog" code="-2"/>
-      <enum name="Successful transaction" code="-1"/>
-                       <enum name="Normal end of session" code="0"/>
-                       <enum name="Unspecified error" code="1"/>
-                       <enum name="Unsuccessful session setup" code="2"/>
-                       <enum name="Internal error" code="3"/>
-                       <enum name="Multiple Choices" code="300"/>
-                       <enum name="Moved Permanently" code="301"/>
-                       <enum name="Moved Temporarily" code="302"/>
-                       <enum name="Use Proxy" code="305"/>
-                       <enum name="Alternative Service" code="380"/>
-                       <enum name="Bad Request" code="400"/>
-                       <enum name="Unauthorized" code="401"/>
-                       <enum name="Payment Required" code="402"/>
-                       <enum name="Forbidden" code="403"/>
-                       <enum name="Not Found" code="404"/>
-                       <enum name="Method Not Allowed" code="405"/>
-                       <enum name="Not Acceptable" code="406"/>
-                       <enum name="Proxy Authentication Required" code="407"/>
-                       <enum name="Request Timeout" code="408"/>
-                       <enum name="Gone" code="410"/>
-                       <enum name="Conditional Request Failed" code="412"/>
-                       <enum name="Request Entity Too Large" code="413"/>
-                       <enum name="Request-URI Too Long" code="414"/>
-                       <enum name="Unsupported Media Type" code="415"/>
-                       <enum name="Unsupported URI Scheme" code="416"/>
-                       <enum name="Unknown Resource-Priority" code="417"/>
-                       <enum name="Bad Extension" code="420"/>
-                       <enum name="Extension Required" code="421"/>
-                       <enum name="Session Interval Too Small" code="422"/>
-                       <enum name="Interval Too Brief" code="423"/>
-                       <enum name="Use Identity Header" code="428"/>
-                       <enum name="Provide Referrer Identity" code="429"/>
-                       <enum name="Bad Identity-Info" code="436"/>
-                       <enum name="Unsupported Certificate" code="437"/>
-                       <enum name="Invalid Identity Header" code="438"/>
-                       <enum name="Temporarily Unavailable" code="480"/>
-                       <enum name="Call/Transaction Does Not Exist" code="481"/>
-                       <enum name="Loop Detected" code="482"/>
-                       <enum name="Too Many Hops" code="483"/>
-                       <enum name="Address Incomplete" code="484"/>
-                       <enum name="Ambiguous" code="485"/>
-                       <enum name="Busy Here" code="486"/>
-                       <enum name="Request Terminated" code="487"/>
-                       <enum name="Not Acceptable Here" code="488"/>
-                       <enum name="Bad Event" code="489"/>
-                       <enum name="Request Pending" code="491"/>
-                       <enum name="Undecipherable" code="493"/>
-                       <enum name="Security Agreement Required" code="494"/>
-                       <enum name="Server Internal Error" code="500"/>
-                       <enum name="Not Implemented" code="501"/>
-                       <enum name="Bad Gateway" code="502"/>
-                       <enum name="Service Unavailable" code="503"/>
-                       <enum name="Server Time-out" code="504"/>
-                       <enum name="Version Not Supported" code="505"/>
-                       <enum name="Message Too Large" code="513"/>
-                       <enum name="Precondition Failure" code="580"/> 
-               <enum name="Busy Everywhere" code="600"/>
-                       <enum name="Decline" code="603"/>
-                       <enum name="Does Not Exist Anywhere" code="604"/>
-                       <enum name="Not Acceptable" code="606"/>
-               </avp>
-               <avp name="Node-Functionality" code="862" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
-                       <type type-name="Unsigned32"/>
-                       <enum name="S-CSCF" code="0"/>
-                       <enum name="P-CSCF" code="1"/>
-                       <enum name="I-CSCF" code="2"/>
-                       <enum name="MRFC" code="3"/>
-                       <enum name="MGCF" code="4"/>
-                       <enum name="BGCF" code="5"/>
-                       <enum name="AS" code="6"/>
-      <enum name="IBCF" code="7"/>
-      <enum name="S-GW" code="8"/>
-      <enum name="P-GW" code="9"/>
-    </avp>
-               <avp name="Service-Specific-Data" code="863" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
+               <avp name="PoC-User-Role-IDs" code="1253" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="UTF8String"/>
                </avp>
-               <avp name="Originator" code="864" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
+               <avp name="PoC-User-Role-info-Units" code="1254" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Enumerated"/>
-                       <enum name="Calling Party" code="0"/>
-                       <enum name="Called Party" code="1"/>
+                       <enum name="Moderator" code="1"/>
+                       <enum name="Dispatcher" code="2"/>
+                       <enum name="Session-Owner" code="3"/>
+                       <enum name="Session-Participant" code="4"/>
+               </avp>
+               <avp name="Talk-Burst-Exchange" code="1255" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="PoC-Change-Time"/>
+                               <gavp name="Number-Of-Talk-Bursts"/>
+                               <gavp name="Talk-Burst-Volume"/>
+                               <gavp name="Talk-Burst-Time"/>
+                               <gavp name="Number-Of-Received-Talk-Bursts"/>
+                               <gavp name="Received-Talk-Burst-Volume"/>
+                               <gavp name="Received-Talk-Burst-Time"/>
+                               <gavp name="Number-Of-Participants"/>
+                               <gavp name="PoC-Change-Condition"/>
+                       </grouped>
                </avp>
-               <avp name="PS-Furnish-Charging-Information" code="865" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
+               <avp name="Service-Generic-Information" code="1256" vendor-bit="must" vendor-id="TGPP">
                        <grouped>
-                               <gavp name="GPRS-Charging-Id"/>
-                               <gavp name="PS-Free-Format-Data"/>
-                               <gavp name="PS-Append-Free-Format-Data"/>
+        <!-- The AVP is defined in OMA-DDS-Charging_Data -->
                        </grouped>
+       </avp>
+               <avp name="Service-Specific-Type" code="1257" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Unsigned32"/>
                </avp>
-               <avp name="PS-Free-Format-Data" code="866" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
-                       <type type-name="OctetString"/>
+               <avp name="Event-Charging-TimeStamp" code="1258" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Time"/>
                </avp>
-               <avp name="PS-Append-Free-Format-Data" code="867" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
+               <avp name="Participant-Access-Priority" code="1259" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Enumerated"/>
-                       <enum name="Append" code="0"/>
-                       <enum name="Overwrite" code="1"/>
-               </avp>
-               <avp name="Time-Quota-Threshold" code="868" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="Unsigned32"/>
+                       <enum name="Pre-emptive priority" code="1"/>
+                       <enum name="High priority" code="2"/>
+                       <enum name="Normal priority" code="3"/>
+                       <enum name="Low priority" code="4"/>
                </avp>
-               <avp name="Volume-Quota-Threshold" code="869" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
-                       <type type-name="Unsigned32"/>
+               <avp name="Participant-Group" code="1260" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Called-Party-Address"/>
+                               <gavp name="Participant-Access-Priority"/>
+                               <gavp name="User-Participating-Type"/>
+                       </grouped>
                </avp>
-               <avp name="Trigger-Type" code="870" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
+               <avp name="PoC-Change-Condition" code="1261" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Enumerated"/>
-                       <enum name="CHANGE_IN_SGSN_IP_ADDRESS" code="1"/>
-                       <enum name="CHANGE_IN_QOS" code="2"/>
-                       <enum name="CHANGE_IN_LOCATION" code="3"/>
-                       <enum name="CHANGE_IN_RAT" code="4"/>
-                       <enum name="CHANGEINQOS_TRAFFIC_CLASS" code="10"/>
-                       <enum name="CHANGEINQOS_RELIABILITY_CLASS" code="11"/>
-                       <enum name="CHANGEINQOS_DELAY_CLASS" code="12"/>
-                       <enum name="CHANGEINQOS_PEAK_THROUGHPUT" code="13"/>
-                       <enum name="CHANGEINQOS_PRECEDENCE_CLASS" code="14"/>
-                       <enum name="CHANGEINQOS_MEAN_THROUGHPUT" code="15"/>
-                       <enum name="CHANGEINQOS_MAXIMUM_BIT_RATE_FOR_UPLINK" code="16"/>
-                       <enum name="CHANGEINQOS_MAXIMUM_BIT_RATE_FOR_DOWNLINK" code="17"/>
-                       <enum name="CHANGEINQOS_RESIDUAL_BER" code="18"/>
-                       <enum name="CHANGEINQOS_SDU_ERROR_RATIO" code="19"/>
-                       <enum name="CHANGEINQOS_TRANSFER_DELAY" code="20"/>
-                       <enum name="CHANGEINQOS_TRAFFIC_HANDLING_PRIORITY" code="21"/>
-                       <enum name="CHANGEINQOS_GUARANTEED_BIT_RATE_FOR_UPLINK" code="22"/>
-                       <enum name="CHANGEINQOS_GUARANTEED_BIT_RATE_FOR_DOWNLINK" code="23"/>
-                       <enum name="CHANGEINLOCATION_MCC" code="30"/>
-                       <enum name="CHANGEINLOCATION_MNC" code="31"/>
-                       <enum name="CHANGEINLOCATION_RAC" code="32"/>
-                       <enum name="CHANGEINLOCATION_LAC" code="33"/>
-      <enum name="CHANGEINLOCATION_CellId" code="34"/>
-      <enum name="CHANGE_IN_MEDIA_COMPOSITION" code="40"/>
-      <enum name="CHANGEINPARTICIPANTS_Number" code="50"/>
-      <enum name="CHANGE_IN_THRSHLD_OF_PARTICIPANTS_NMB" code="51"/>
-      <enum name="CHANGE_IN_USER_PARTICIPATING_TYPE" code="52"/>
-      <enum name="CHANGE_IN_SERVICE_CONDITION" code="60"/>
+                       <enum name="serviceChange" code="0"/>
+                       <enum name="volumeLimit" code="1"/>
+                       <enum name="timeLimit" code="2"/>
+                       <enum name="numberofTalkBurstLimit" code="3"/>
+                       <enum name="numberofActiveParticipants" code="4"/>
+                       <enum name="tariffTime" code="5"/>
+               </avp>
+               <avp name="PoC-Change-Time" code="1262" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Time"/>
+               </avp>
+    <!-- The Access-Network-Information AVP (AVP code 1263) is of type OctetString and indicates the SIP P-header
+        "P-Access-Network-Information".
+        As it's a SIP Header the actual content will be text so for Wireshark displays sake we treat this as
+        an UTF8String
+        -->
+    <avp name="Access-Network-Information" code="1263" vendor-bit="must" vendor-id="TGPP">
+      <!-- <type type-name="OctetString"/>  -->
+      <type type-name="UTF8String"/>
     </avp>
-               <avp name="Quota-Holding-Time" code="871" mandatory="must" vendor-bit="must" vendor-id="TGPP">
+    <avp name="Trigger" code="1264" vendor-bit="must" vendor-id="TGPP">
+                                       <grouped>
+                                       <gavp name="Trigger-Type"/>
+                                       </grouped>
+               </avp>
+               <avp name="Base-Time-Interval" code="1265" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Unsigned32"/>
                </avp>
-               <avp name="Reporting-Reason" code="872" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
+               <avp name="Envelope" code="1266" vendor-bit="must" vendor-id="TGPP">
+                                       <grouped>
+                                       <gavp name="Envelope-Start-Time"/>
+                                       <gavp name="Envelope-End-Time"/>
+                                       <gavp name="CC-Total-Octets"/>
+                                       <gavp name="CC-Input-Octets"/>
+                                       <gavp name="CC-Output-Octets"/>
+                                       <gavp name="CC-Service-Specific-Units"/>
+                                       </grouped>
+               </avp>
+               <avp name="Envelope-End-Time" code="1267" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Time"/>
+               </avp>
+               <avp name="Envelope-Reporting" code="1268" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Enumerated"/>
-                       <enum name="THRESHOLD" code="0"/>
-                       <enum name="QHT" code="1"/>
-                       <enum name="FINAL" code="2"/>
-                       <enum name="QUOTA_EXHAUSTED" code="3"/>
-                       <enum name="VALIDITY_TIME" code="4"/>
-                       <enum name="OTHER_QUOTA_TYPE" code="5"/>
-                       <enum name="RATING_CONDITION_CHANGE" code="6"/>
-                       <enum name="FORCED_REAUTHORISATION" code="7"/>
-                       <enum name="POOL_EXHAUSTED" code="8"/>
+                       <enum name="DO_NOT_REPORT_ENVELOPES" code="0"/>
+                       <enum name="REPORT_ENVELOPES" code="1"/>
+                       <enum name="REPORT_ENVELOPES_WITH_VOLUME" code="2"/>
+                       <enum name="REPORT_ENVELOPES_WITH_EVENTS" code="3"/>
+                       <enum name="REPORT_ENVELOPES_WITH_VOLUME_AND_EVENTS" code="4"/>
                </avp>
-               <avp name="Service-Information" code="873" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
-                       <grouped>
-                               <gavp name="PS-Information"/>
-                               <gavp name="WLAN-Information"/>
-                               <gavp name="IMS-Information"/>
-                               <gavp name="MMS-Information"/>
-                               <gavp name="LCS-Information"/>
-                               <gavp name="PoC-Information"/>
-                               <gavp name="MBMS-Information"/>
-                       </grouped>
+               <avp name="Envelope-Start-Time" code="1269" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Time"/>
                </avp>
-               <avp name="PS-Information" code="874" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
+               <avp name="Time-Quota-Mechanism" code="1270" vendor-bit="must" vendor-id="TGPP">
                        <grouped>
-                               <gavp name="3GPP-Charging-Id"/>
-                               <gavp name="3GPP-PDP Type"/>
-                               <gavp name="PDP-Address"/>
-                               <gavp name="3GPP-GPRS-Negotiated-QoS-Profile"/>
-                               <gavp name="SGSN-Address"/>
-                               <gavp name="GGSN-Address"/>
-                               <gavp name="CG-Address"/>
-                               <gavp name="3GPP-IMSI-MCC-MNC"/>
-                               <gavp name="3GPP-GGSN- MCC-MNC"/>
-                               <gavp name="3GPP-NSAPI"/>
-                               <gavp name="Called-Station-Id"/>
-                               <gavp name="3GPP-Session-Stop-Indicator"/>
-                               <gavp name="3GPP-Selection-Mode"/>
-                               <gavp name="3GPP-Charging-Characteristics"/>
-                               <gavp name="3GPP-SGSN-MCC-MNC"/>
-                               <gavp name="3GPP-MS-TimeZone"/>
-                               <gavp name="3GPP-CAMEL-Charging-Info"/>
-                               <gavp name="Charging-Rule-Base-Name"/>
-                               <gavp name="3GPP-User-Location-Info"/>
-                               <gavp name="3GPP-RAT-Type"/>
-                               <gavp name="PS-Furnish-Charging-Information"/>
+                               <gavp name="Time-Quota-Type"/>
+                               <gavp name="Base-Time-Interval"/>
                        </grouped>
                </avp>
-               <avp name="WLAN-Information" code="875" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
-      <grouped>
-        <gavp name="WLAN-Session-Id"/>
-        <gavp name="PDG-Address"/>
-        <gavp name="NPDG-Charging-Id"/>
-        <gavp name="WAG-Address"/>
-        <gavp name="WAG-PLMN-Id"/>
-        <gavp name="WLAN-Radio-Container"/>
-        <gavp name="WLAN-UE-Local-IPAddress"/>
-      </grouped>
-    </avp>
-               <avp name="IMS-Information" code="876" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
+               <avp name="Time-Quota-Type" code="1271" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="DISCRETE_TIME_PERIOD" code="0"/>
+                       <enum name="CONTINUOUS_TIME_PERIOD" code="1"/>
+       </avp>
+               <avp name="Early-Media-Description" code="1272" vendor-bit="must" vendor-id="TGPP">
                        <grouped>
-                               <gavp name="Event-Type"/>
-                               <gavp name="Role-Of-Node"/>
-                               <gavp name="Node-Functionality"/>
-                               <gavp name="User-Session-ID"/>
-                               <gavp name="Calling-Party-Address"/>
-                               <gavp name="Called-Party-Address"/>
-                               <gavp name="Time-Stamps"/>
-                               <gavp name="Application-Server-Information"/>
-                               <gavp name="Inter-Operator-Identifier"/>
-                               <gavp name="IMS-Charging-Identifier"/>
-                               <gavp name="SDP-Session-Description"/>
+                               <gavp name="SDP-TimeStamps"/>
                                <gavp name="SDP-Media-Component"/>
-                               <gavp name="GGSN-Address"/>
-                               <gavp name="Served-Party-IP-Address"/>
-                               <gavp name="Server-Capabilities"/>
-                               <gavp name="Trunk-Group-ID"/>
-                               <gavp name="Bearer-Service"/>
-                               <gavp name="Service-Id"/>
-                               <gavp name="Service-Specific-Data"/>
-                               <gavp name="Message-Body"/>
-        <gavp name="Cause-Code"/>
-        <gavp name="Access-Network-Information"/>
-        <gavp name="Early-Media-Description"/>
-        <gavp name="IMS-Communication-Service-Identifier"/>
-      </grouped>
+                               <gavp name="SDP-Session-Description"/>
+                       </grouped>
                </avp>
-               <avp name="MMS-Information" code="877" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
-                       <grouped>
-                               <gavp name="Originator-Address"/>
-                               <gavp name="Recipient-Address"/>
-                               <gavp name="Submission-Time"/>
-                               <gavp name="MM-Content Type"/>  
-                               <gavp name="Priority"/>
-                               <gavp name="Message-ID"/>
-                               <gavp name="Message-Type"/>
-                               <gavp name="Message-Size"/>
-                               <gavp name="Message-Class"/>
-                               <gavp name="Delivery-Report-Requested"/>
-                               <gavp name= "Read-Reply-Report-Requested"/>
-                               <gavp name="MMBox-Storage-Information"/>
-                               <gavp name="Applic-ID"/>
-                               <gavp name="Reply-Applic-ID"/>
-                               <gavp name="Aux-Applic-Info"/>
-                               <gavp name="Content-Class"/>
-                               <gavp name="DRM-Content"/>
-        <gavp name="Adaptations"/>
-        <gavp name="VASP-Id"/>
-        <gavp name="VAS-Id"/>
-      </grouped>
-    </avp>
-               <avp name="LCS-Information" code="878" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
+               <avp name="SDP-TimeStamps" code="1273" vendor-bit="must" vendor-id="TGPP">
                        <grouped>
-                               <gavp name="LCS-Client-ID"/>
-                               <gavp name="Location-Type"/>
-                               <gavp name="Location-Estimate"/>
-                               <gavp name="Positioning-Data"/>
-                               <gavp name="IMSI"/>
-                               <gavp name="MSISDN"/>
+                               <gavp name="SDP-Offer-Timestamp"/>
+                               <gavp name="SDP-Answer-Timestamp"/>
                        </grouped>
                </avp>
-               <avp name="PoC-Information" code="879" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
-                       <grouped>
-                               <gavp name="PoC-Server-Role"/>
-        <gavp name="PoC-Session-Type"/>
-        <gavp name="PoC-User-Role"/>
-        <gavp name="PoC-Session-Initiation-type"/>
-        <gavp name="PoC-Event-Type"/>
-        <gavp name="Number-Of-Participants"/>
-        <gavp name="Participants-Involved"/>
-        <gavp name="Participant-Group"/>
-        <gavp name="Talk-Burst-Exchange"/>
-                               <gavp name="PoC-Controlling-Address"/>
-        <gavp name="PoC-Group-Name"/>
-        <gavp name="PoC-Session-Id"/>
-        <gavp name="Charged-Party"/>
-      </grouped>
+               <avp name="SDP-Offer-Timestamp" code="1274" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Time"/>
                </avp>
-               <avp name="MBMS-Information" code="880" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
-      <grouped>
-        <gavp name="TMGI"/>
-        <gavp name="MBMS-Service-Type"/>
-        <gavp name="MBMS-User-Service-Type"/>
-        <gavp name="File-Repair-Supported"/>
-        <gavp name="Required-MBMS-Bearer-Capabilities"/>
-        <gavp name="MBMS-2G-3G-Indicator"/>
-        <gavp name="RAI"/>
-        <gavp name="MBMS-Service-Area"/>
-        <gavp name="MBMS-Session-Identity"/>
-      </grouped>
-    </avp>
-               <avp name="Quota-Consumption-Time" code="881" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="Unsigned32"/>
+               <avp name="SDP-Answer-Timestamp" code="1275" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Time"/>
                </avp>
-               <avp name="Media-Initiator-Flag" code="882" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="Enumerated"/>
-                       <enum name="called party" code="0"/>
-                       <enum name="calling party" code="1"/>
-                       <enum name="unknown" code="2"/>
+               <avp name="AF-Correlation-Information" code="1276" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="AF-Charging-Identifier"/>
+                               <gavp name="Flows"/>
+                       </grouped>
                </avp>
-
-               <avp name="PoC-Server-Role" code="883" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+               <avp name="PoC-Session-Initiation-type" code="1277" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Enumerated"/>
-                       <enum name="Participating PoC Server" code="0"/>
-                       <enum name="Controlling PoC Server" code="1"/>
+                       <enum name="Pre-established" code="0"/>
+                       <enum name="On-demand" code="1"/>
                </avp>
-
-               <avp name="PoC-Server-Role" code="884" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+               <avp name="Offline-Charging" code="1278" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Quota-Consumption-Time"/>
+                               <gavp name="Time-Quota-Mechanism"/>
+                               <gavp name="Envelope-Reporting"/>
+                               <gavp name="Multiple-Services-Credit-Control"/>
+                       </grouped>
+               </avp>
+               <avp name="User-Participating-Type" code="1279" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Enumerated"/>
-                       <enum name="1 to 1 PoC session" code="0"/>
-                       <enum name="chat PoC group session" code="1"/>
-                       <enum name="pre-arranged PoC group session" code="2"/>
-                       <enum name="ad-hoc PoC group session" code="3"/>
+                       <enum name="Normal" code="0"/>
+                       <enum name="NW PoC Box" code="1"/>
+                       <enum name="UE PoC Box" code="2"/>
                </avp>
-
-               <avp name="Number-Of-Participants" code="885" mandatory="must" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="Integer32"/>
+               <avp name="Alternate-Charged-Party-Address" code="1280" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
                </avp>
-    <avp name="Originator-Address" code="886" mandatory="must" vendor-bit="must" vendor-id="TGPP">
-      <grouped>
-        <gavp name="Address-Type"/>
-        <gavp name="Address-Data"/>
-        <gavp name="Address-Domain"/>
-                       </grouped>
-    </avp>
-    <avp name="Participants-Involved" code="887" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+               <avp name="IMS-Communication-Service-Identifier" code="1281" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="UTF8String"/>
                </avp>
-
-               <avp name="Expires" code="888" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
+               <avp name="Number-Of-Received-Talk-Bursts" code="1282" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Unsigned32"/>
+               </avp>
+               <avp name="Number-Of-Talk-Bursts" code="1283" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Unsigned32"/>
+               </avp>
+               <avp name="Received-Talk-Burst-Time" code="1284" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Unsigned32"/>
+               </avp>
+               <avp name="Received-Talk-Burst-Volume" code="1285" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Unsigned32"/>
                </avp>
+               <avp name="Talk-Burst-Time" code="1286" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Unsigned32"/>
+               </avp>
+               <avp name="Talk-Burst-Volume" code="1287" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Unsigned32"/>
+               </avp>
+               <avp name="Media-Initiator-Party" code="1288" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
+               </avp>
 
-               <avp name="Message-Body" code="889" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+<!-- Note: The AVP codes from 1289 to 1399 are reserved for TS 32.299 -->
+<!-- 3GPP TS 29.272 V9.1.0 (2009-12 -->
+               <avp name="Subscription-Data" code="1400" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
                        <grouped>
-                               <gavp name="Content-Type"/>
-                               <gavp name="Content-Length"/>
-                               <gavp name="Content-Disposition"/>
-                               <gavp name="Originator"/>
+                                       <gavp name="Subscriber-Status"/>
+                                       <gavp name="MSISDN"/>
+                                       <gavp name="STN-SR"/>
+                                       <gavp name="Network-Access-Mode"/>
+                                       <gavp name="Operator-Determined-Barring"/>
+                                       <gavp name="HPLMN-ODB"/>
+                                       <gavp name="Regional-Subscription-Zone-Code"/>
+                                       <gavp name="Access-Restriction-Data"/>
+                                       <gavp name="APN-OI-Replacement"/>
+                                       <gavp name="3GPP-Charging-Characteristics"/>
+                                       <gavp name="AMBR"/>
+                                       <gavp name="APN-Configuration-Profile"/>
+                                       <gavp name="RAT-Frequency-Selection-Priority-ID"/>
+                                       <gavp name="Trace-Data"/>
+                                       <gavp name="GPRS-Subscription-Data"/>
+                                       <gavp name="CSG-Subscription-Data"/>
+                                       <gavp name="Roaming-Restricted-Due-To-Unsupported-Feature"/>
                        </grouped>
                </avp>
-               <avp name="WAG-Address" code="890" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
-                       <type type-name="IPAddress"/>
+               <avp name="Terminal-Information" code="1401" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <grouped>
+                                       <gavp name="IMEI"/>
+                                       <gavp name="TGPP2-MEID"/>
+                                       <gavp name="Software-Version"/>
+                       </grouped>
                </avp>
-               <avp name="WAG-PLMN-Id" code="891">
-                       <type type-name="OctetString"/>
+               <avp name="IMEI" code="1402" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
                </avp>
-               <avp name="WLAN-Radio-Container" code="892" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <grouped>
-        <gavp name="Operator-Name"/>
-        <gavp name="Location-Type"/>
-        <gavp name="Location-Information"/>
-        <gavp name="WLAN-Technology"/>
-      </grouped>
+               <avp name="Software-Version" code="1403" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
                </avp>
-               <avp name="WLAN-Technology" code="893" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+               <avp name="QoS-Subscribed" code="1404" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="ULR-Flags" code="1405" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
                        <type type-name="Unsigned32"/>
                </avp>
-               <avp name="WLAN-UE-Local-IPAddress" code="894" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="IPAddress"/>
+               <avp name="ULA-Flags" code="1406" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="Unsigned32"/>
                </avp>
-               <avp name="PDG-Address" code="895" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="IPAddress"/>
+               <avp name="Visited-PLMN-Id" code="1407" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
                </avp>
-               <avp name="PDG-Charging-Id" code="896" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+               <avp name="Requested-EUTRAN-Authentication-Info" code="1408" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <grouped>
+                                       <gavp name="Number-Of-Requested-Vectors"/>
+                                       <gavp name="Immediate-Response-Preferred"/>
+                                       <gavp name="Re-synchronization-Info"/>
+                       </grouped>
+               </avp>
+               <avp name="Requested-UTRAN-GERAN-Authentication-Info" code="1409" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <grouped>
+                                       <gavp name="Number-Of-Requested-Vectors"/>
+                                       <gavp name="Immediate-Response-Preferred"/>
+                                       <gavp name="Re-synchronization-Info"/>
+                       </grouped>
+               </avp>
+               <avp name="Number-Of-Requested-Vectors" code="1410" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
                        <type type-name="Unsigned32"/>
                </avp>
-               <avp name="Address-Data" code="897" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="UTF8String"/>
+               <avp name="Re-Synchronization-Info" code="1411" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
                </avp>
-               <avp name="Address-Domain" code="898" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <grouped>
-        <gavp name="Domain-Name"/>
-        <gavp name="3GPP-IMSI-MCC-MNC"/>
-      </grouped>
+               <avp name="Immediate-Response-Preferred" code="1412" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="Unsigned32"/>
                </avp>
-               <avp name="Address-Type" code="899" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="Enumerated"/>
-      <enum name="e-mail address" code="0"/>
-      <enum name="MSISDN" code="1"/>
-      <enum name="IPv4 Address" code="2"/>
-      <enum name="IPv6 Address" code="3"/>
-      <enum name="Numeric Shortcode" code="4"/>
-      <enum name="Alphanumeric Shortcode" code="5"/>
-      <enum name="Other" code="6"/>
-    </avp>
-
-<!--
-Note: The AVP codes from 900 to 999 are reserved for TS 29.061
-29.210
-******** Found in TGPPGmb.xml ********
--->
-               <avp name="Bearer-Usage" code="1000" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="Enumerated"/>
-                       <enum name="GENERAL" code="0"/>
-                       <enum name="IMS SIGNALLING" code="1"/>
-                       <enum name="DEDICATED" code="2"/>
+               <avp name="Authentication-Info" code="1413" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <grouped>
+                                       <gavp name="E-UTRAN-Vector"/>
+                                       <gavp name="UTRAN-Vector"/>
+                                       <gavp name="GERAN-Vector"/>
+                       </grouped>
                </avp>
-               <avp name="Charging-Rule-Install" code="1001" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+               <avp name="E-UTRAN-Vector"      code="1414" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
                        <grouped>
-                               <gavp name="Charging-Rule-Definition"/>
-                               <gavp name="Charging-Rule-Name"/>
-                               <gavp name="Charging-Rule-Base-Name"/>
+                                       <gavp name="Item-Number"/>
+                                       <gavp name="RAND"/>
+                                       <gavp name="XRES"/>
+                                       <gavp name="AUTN"/>
+                                       <gavp name="KASME"/>
                        </grouped>
                </avp>
-               <avp name="Charging-Rule-Remove" code="1002" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+               <avp name="UMTS-Vector" code="1415" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
                        <grouped>
-                               <gavp name="Charging-Rule-Name"/>
-                               <gavp name="Charging-Rule-Base-Name"/>
+                                       <gavp name="Item-Number"/>
+                                       <gavp name="RAND"/>
+                                       <gavp name="XRES"/>
+                                       <gavp name="AUTN"/>
+                                       <gavp name="Confidentiality-Key"/>
+                                       <gavp name="Integrity-Key"/>
                        </grouped>
                </avp>
-               <avp name="Charging-Rule-Definition" code="1003" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+               <avp name="GERAN-Vector" code="1416" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
                        <grouped>
-                               <gavp name="Rating-Group"/>
-                               <gavp name="Charging-Rule-Name"/>
-                               <gavp name="Flow-Description"/>
-                               <gavp name="Flow-Status"/>
-                               <gavp name="Precedence"/>
-                               <gavp name="Reporting-Level"/>
+                                       <gavp name="Item-Number"/>
+                                       <gavp name="RAND"/>
+                                       <gavp name="SRES"/>
+                                       <gavp name="Kc"/>
                        </grouped>
                </avp>
-               <avp name="Charging-Rule-Base-Name" code="1004" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="UTF8String"/>
+               <avp name="Network-Access-Mode" code="1417" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="PACKET_AND_CIRCUIT" code="0"/>
+                       <enum name="Reserved" code="1"/>
+                       <enum name="ONLY_PACKET" code="2"/>
                </avp>
-               <avp name="Charging-Rule-Name" code="1005" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="OctetString"/>
+               <avp name="HPLMN-ODB" code="1418" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="Unsigned32"/>
                </avp>
-               <avp name="Event-Trigger" code="1006" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="Enumerated"/>
-                         <enum name="SGSN CHANGE" code="0"/>
-                         <enum name="QOS CHANGE" code="1"/>
-                         <enum name="RAT CHANGE" code="2"/>
-                         <enum name="TFT CHANGE" code="3"/>
-                         <enum name="PLMN CHANGE" code="4"/>
-                         <enum name="TFT DELETED" code="1000"/>
-                         <enum name="LOSS OF BEARER" code="1001"/>
-                         <enum name="RECOVERY OF BEARER" code="1002"/>
-                         <enum name="POLICY ENFORCEMENT FAILED" code="1003"/>
+               <avp name="Item-Number" code="1419" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="Unsigned32"/>
                </avp>
-               <avp name="Metering-Method" code="1007" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+               <avp name="Cancellation-Type" code="1420" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
                        <type type-name="Enumerated"/>
-                       <enum name="DURATION" code="0" /> 
-                       <enum name="VOLUME" code="1" />                                                 
-                       <enum name="DURATION_VOLUME" code="1" />                        
+                       <enum name="MME_UPDATE_PROCEDURE" code="0"/>
+                       <enum name="SGSN_UPDATE_PROCEDURE" code="1"/>
+                       <enum name="SUBSCRIPTION_WITHDRAWAL" code="2"/>
+                       <enum name="UPDATE_PROCEDURE_IWF" code="3"/>
+                       <enum name="INITIAL_ATTACH_PROCEDURE" code="4"/>
                </avp>
-               <avp name="Offline" code="1008" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="Enumerated"/>
-                       <enum name="DISABLE_OFFLINE" code="0"/>
-                       <enum name="ENABLE_OFFLINE" code="1"/>
+               <avp name="DSR-Flags" code="1421" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="Unsigned32"/>
                </avp>
-               <avp name="Online" code="1009">
-                       <type type-name="Enumerated"/>
-                       <enum name="DISABLE_ONLINE" code="0"/>
-                       <enum name="ENABLE_ONLINE" code="1"/>
+               <avp name="DSA-Flags" code="1422" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="Unsigned32"/>
                </avp>
-               <avp name="Precedence" code="1010" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+               <avp name="Context-Identifier" code="1423" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
                        <type type-name="Unsigned32"/>
                </avp>
-               <avp name="Reporting-Level" code="1011" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+               <avp name="Subscriber-Status" code="1424" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
                        <type type-name="Enumerated"/>
-                       <enum name="CHARGING RULE LEVEL" code="0"/>
-                       <enum name="RATING GROUP LEVEL" code="1"/>
+                       <enum name="SERVICE_GRANTED" code="0"/>
+                       <enum name="OPERATOR_DETERMINED_BARRING" code="1"/>
                </avp>
-               <avp name="TFT-Filter" code="1012">
-                       <type type-name="IPFilterRule"/>
+               <avp name="Operator-Determined-Barring" code="1425" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="Unsigned32"/>
                </avp>
-               <avp name="TFT-Packet-Filter-Information" code="1013" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <grouped>
-                               <gavp name="Precedence"/>
-                               <gavp name="TFT-Filter"/>
-                               <gavp name="TOS-Traffic-Class"/>
-                       </grouped>              
+               <avp name="Access-Restriction-Data" code="1426" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="Unsigned32"/>
                </avp>
-               <avp name="ToS-Traffic-Class" code="1014" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-               <type type-name="OctetString"/>
+               <avp name="APN-OI-Replacement" code="1427" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
                </avp>
-               <avp name="PDP-Session-operation" code="1015" vendor-id="TGPP" protected="may" mandatory="must" may-encrypt="yes" vendor-bit="must">
-                       <type type-name="Unsigned32" /> 
-                       <enum name="PDP-SESSION-TERMINATION" code="0" />                                                                
+               <avp name="All-APN-Configurations-Included-Indicator" code="1428" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="ALL_APN_CONFIGURATIONS_INCLUDED" code="0"/>
+                       <enum name="MODIFIED/ADDED_APN_CONFIGURATIONS_INCLUDED" code="1"/>
                </avp>
-
-<!--
-  1016 QoS-Information Grouped   
-  1018 Charging-Rule-Report Grouped   
-  1019 PCC-Rule-Status Enumerated   
-  1020 Bearer-Identifier OctetString   
-  1021 Bearer-Operation Enumerated   
-  1022 Access-Network-Charging-Identifier-Gx Grouped   
-  1023 Bearer-Control-Mode Enumerated   
-  1024 Network-Request-Support Enumerated   
-  1025 Guaranteed-Bitrate-DL Unsigned32   
-  1026 Guaranteed-Bitrate-UL Unsigned32   
-  1027 IP-CAN-Type Enumerated   
-  1028 QoS-Class-Identifier Enumerated 
-1029 QoS-Negotiation Enumerated
-1030 QoS-Upgrade Enumerated
-1031 Rule-Failure-Code Enumerated
-29.210 [15]
-Note: The AVP codes from 1015 to 1099 are reserved for TS 29.210
-
--->
-    <avp name="RAT-Type" code="1032" vendor-id="TGPP" protected="may" mandatory="must" may-encrypt="yes" vendor-bit="must">
-      <type type-name="Enumerated" />
-      <enum name="WLAN" code="0" />
-      <enum name="UTRAN" code="1000" />
-      <enum name="GERAN" code="1001" />
-      <enum name="GAN" code="1002" />
-      <enum name="HSPA_EVOLUTION" code="1003" />
-      <enum name="EUTRAN" code="1004" />
-      <enum name="CDMA2000_1X" code="2000" />
-      <enum name="HRPD" code="2001" />
-      <enum name="UMB" code="2002" />
-    </avp>
-<!--
-1033 Event-Report-Indication Grouped
-1034 Allocation-Retention-Priority Grouped
-1035 CoA-IP-Address Address
-1036 Tunnel-Header-Filter IPFilterRule
-1037 Tunnel-Header-Length Unsigned32
-1038 Tunnel-Information Grouped
-1039 CoA-Information Grouped
-1040 APN-Aggregate-Max-Bitrate-DL Unsigned32
-1041 APN-Aggregate-Max-Bitrate-UL Unsigned32
-1042 Revalidation-Time Time
-1043 Rule-Activation-Time Time
-1044 Rule-DeActivation-Time Time
-1045 Session-Release-Cause Enumerated
-1046 Priority-Level Unsigned32
-1047 Pre-emption-Capability Enumerated
-1048 Pre-emption-Vulnerability Enumerated
-1049 Default-EPS-Bearer-QoS Grouped
-1050 AN-GW-Address Address
--->
-    <!-- Note: The AVP codes from 1051 to 1099 are reserved for TS 29.210 -->
-<!-- ETSI TS 129 140 V6.3.0 (2005-12) -->
-               <avp name="Served-User-Identity" code="1100" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+               <avp name="APN-Configuration-Profile" code="1429" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
                        <grouped>
-                               <gavp name="MSISDN"/>
-                               <gavp name="VASP-ID"/>
-                               <gavp name="VAS-ID"/>
-                       </grouped>              
+                                       <gavp name="Context-Identifier"/>
+                                       <gavp name="All-APN-Configurations-Included-Indicator"/>
+                                       <gavp name="APN-Configuration"/>
+                       </grouped>
                </avp>
-               <avp name="VASP-ID" code="1101" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="UTF8String"/>
+               <avp name="APN-Configuration" code="1430" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <grouped>
+                                       <gavp name="Context-Identifier"/>
+                                       <gavp name="Served-Party-IP-Address"/>
+                                       <gavp name="Served-Party-IP-Address"/>
+                                       <gavp name="PDN-Type"/>
+                                       <gavp name="Service-Selection"/>
+                                       <gavp name="EPS-Subscribed-QoS-Profile"/>
+                                       <gavp name="VPLMN-Dynamic-Address-Allowed"/>
+                                       <gavp name="MIP6-Agent-Info"/>
+                                       <gavp name="PDN-GW-Allocation-Type"/>
+                                       <gavp name="3GPP-Charging-Characteristics"/>
+                                       <gavp name="AMBR"/>
+                                       <gavp name="Specific-APN-Info"/>
+                                       <gavp name="APN-OI-Replacement"/>
+                       </grouped>
                </avp>
-               <avp name="VAS-ID" code="1102" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="UTF8String"/>
+               <avp name="EPS-Subscribed-QoS-Profile" code="1431" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <grouped>
+                                       <gavp name="QoS-Class-Identifier"/>
+                                       <gavp name="Allocation-Retention-Priority"/>
+                       </grouped>
                </avp>
-               <avp name="Trigger-Event" code="1103" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+               <avp name="VPLMN-Dynamic-Address-Allowed" code="1432" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
                        <type type-name="Enumerated"/>
-                       <enum name="MM1 Message Submission, Profile based" code="0"/>
-                       <enum name="MM1 Message Submission, Address based" code="1"/>
-                       <enum name="MM1 Message Delivery" code="2"/>
-                       <enum name="MM7 Message Submission, Profile based" code="3"/>
-                       <enum name="MM7 Message Submission, Address based" code="4"/>
+                       <enum name="NOTALLOWED" code="0"/>
+                       <enum name="ALLOWED" code="1"/>
                </avp>
-               <avp name="Sender-Address" code="1104" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="UTF8String"/>
+               <avp name="STN-SR" code="1433" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
                </avp>
-               <avp name="Initial-Recipient-Address" code="1105" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+               <avp name="Alert-Reason" code="1434" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="UE_PRESENT" code="0"/>
+                       <enum name="UE_MEMORY_AVAILABLE" code="1"/>
+               </avp>
+               <avp name="AMBR" code="1435" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
                        <grouped>
-                               <gavp name="Sequence-Number"/>
-                               <gavp name="Recipient-Address"/>
-                       </grouped>              
+                                       <gavp name="Max-Requested-Bandwidth-UL"/>
+                                       <gavp name="Max-Requested-Bandwidth-DL"/>
+                       </grouped>
                </avp>
-               <avp name="Result-Recipient-Address" code="1106" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+               <avp name="CSG-Subscription-Data" code="1436" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
                        <grouped>
-                               <gavp name="Sequence-Number"/>
-                               <gavp name="Recipient-Address"/>
-                               <gavp name="Routeing-Address"/>
-                               <gavp name="Sender-Address"/>
-                       </grouped>              
+                                       <gavp name="CSG-Id"/>
+                                       <gavp name="Expiration-Date"/>
+                       </grouped>
                </avp>
-               <avp name="Sequence-Number" code="1107" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+               <avp name="CSG-Id" code="1437" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
                        <type type-name="Unsigned32"/>
                </avp>
-               <avp name="Recipient-Address" code="1108" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="UTF8String"/>
+               <avp name="PDN-GW-Allocation-Type" code="1438" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="STATIC" code="0"/>
+                       <enum name="DYNAMIC" code="1"/>
                </avp>
-               <avp name="Routeing-Address" code="1109" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="UTF8String"/>
+               <avp name="Expiration-Date" code="1439" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="Time"/>
                </avp>
-               <avp name="Originating-Interface" code="1110" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="Enumerated"/>
-                       <enum name="MM1" code="0"/>
-                       <enum name="MM3" code="1"/>
-                       <enum name="MM4" code="2"/>
-                       <enum name="MM7" code="3"/>
+               <avp name="RAT-Frequency-Selection-Priority-ID" code="1440" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="Unsigned32"/>
                </avp>
-               <avp name="Delivery-Report" code="1111" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="Enumerated"/>
-                       <enum name="No Delivery Report Requested" code="0"/>
-                       <enum name="Delivery Report Requested" code="1"/>
+               <avp name="IDA-Flags" code="1441" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="Unsigned32"/>
                </avp>
-               <avp name="Read-Reply" code="1112" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="Enumerated"/>
-                       <enum name="No Read Reply Requested" code="0"/>
-                       <enum name="Read Reply Requested" code="1"/>
+               <avp name="PUA-Flags" code="1442" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="Unsigned32"/>
                </avp>
-               <avp name="Sender-Visibility" code="1113" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="Enumerated"/>
-                       <enum name="Sender Identification requested not to be hidden" code="0"/>
-                       <enum name="Sender Identification requested to be hidden" code="1"/>
+               <avp name="NOR-Flags" code="1443" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="Unsigned32"/>
                </avp>
-               <avp name="Service-Key" code="1114" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+               <avp name="User-Id" code="1444" vendor-bit="must" mandatory="mustnot" may-encrypt="no" vendor-id="TGPP">
                        <type type-name="UTF8String"/>
                </avp>
-               <avp name="Billing-Information" code="1115" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="UTF8String"/>
+               <avp name="Equipment-Status" code="1445" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="WHITELISTED" code="0"/>
+                       <enum name="BLACKLISTED" code="1"/>
+                       <enum name="GREYLISTED" code="2"/>
                </avp>
-               <avp name="Status" code="1116" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <grouped>
-                               <gavp name="Status-Code"/>
-                               <gavp name="Status-Text"/>
-                       </grouped>              
+               <avp name="Regional-Subscription-Zone-Code" code="1446" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
                </avp>
-               <avp name="Status-Code" code="1117" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="UTF8String"/>
+               <avp name="RAND" code="1447" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
                </avp>
-               <avp name="Status-Text" code="1118" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="UTF8String"/>
+               <avp name="XRES" code="1448" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
                </avp>
-               <avp name="Routeing-Address-Resolution" code="1119" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="Enumerated"/>
-                       <enum name="unresolved" code="0"/>
-                       <enum name="resolved" code="1"/>
+               <avp name="AUTN" code="1449" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
                </avp>
-
-<!--29.140 [16]
-Note: The AVP codes from 1119 to 1199 are reserved for TS 29.140
-32.299
--->
-               <avp name="Domain-Name" code="1200" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="UTF8String"/>
+               <avp name="KASME" code="1450" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
                </avp>
-               <avp name="Recipient-Address" code="1201" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <grouped>
-                               <gavp name="Address-Type"/>
-                               <gavp name="Address-Data"/>
-                               <gavp name="Address-Domain"/>
-                               <gavp name="Addressee-Type"/>
-                       </grouped>              
+               <avp name="Trace-Collection-Entity" code="1452" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="IPAddress"/>
                </avp>
-               <avp name="Submission-Time" code="1202" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="Time"/>
+               <avp name="Kc" code="1453" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
                </avp>
-               <avp name="MM-Content-Type" code="1203" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <grouped>
-                               <gavp name="Type-Number"/>
-                               <gavp name="Additional-Type-Information"/>
-                               <gavp name="Content-Size"/>
-                               <gavp name="Additional-Content-Information"/>
-                       </grouped>
+               <avp name="SRES" code="1454" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
                </avp>
-<!-- The Type-Number AVP (AVP code1204) is of type Enumerated and identifies the well-known -->
-<!-- media types. The values are taken from OMNA WSP Content Type Codes database -->
-<!-- http://www.openmobilealliance.org/tech/omna/omna-wsp-content-type.htm -->
-               <avp name="Type-Number" code="1204" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+               <!-- Requesting-Node-Type is from old (v8.1.0 - v8.2.0) versions of 29.272. -->
+               <avp name="Requesting-Node-Type" code="1455" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
                        <type type-name="Enumerated"/>
-                       <enum name="text/*" code="1"/>
-                       <enum name="text/html" code="2"/> 
-                       <enum name="text/plain" code="3"/> 
-                       <enum name="text/x-hdml" code="4"/> 
-                       <enum name="text/x-ttml" code="5"/>
-                       <enum name="text/x-vCalendar" code="6"/>
-                       <enum name="text/x-vCard" code="7"/>
-                       <enum name="text/vnd.wap.wml" code="9"/>
-                       <enum name="text/vnd.wap.wmlscript" code="9"/>
-                       <enum name="text/vnd.wap.wta-event" code="10"/>
-                       <enum name="multipart/*" code="11"/>
-                       <enum name="multipart/mixed" code="12"/>
-                       <enum name="multipart/form-data" code="13"/>
-                       <enum name="multipart/byterantes" code="14"/>
-                       <enum name="multipart/alternative" code="15"/>
-                       <enum name="application/*" code="16"/>
-                       <enum name="application/java-vm" code="17"/> 
-                       <enum name="application/x-www-form-urlencoded" code="18"/>
-      <enum name="application/x-hdmlc" code="19"/>
-      <enum name="application/vnd.wap.wmlc" code="20"/>
-      <enum name="application/vnd.wap.wmlscriptc" code="21"/>
-      <enum name="application/vnd.wap.wta-eventc" code="22"/>
-      <enum name="application/vnd.wap.uaprof" code="23"/>
-      <enum name="application/vnd.wap.wtls-ca-certificate" code="24"/>
-      <enum name="application/vnd.wap.wtls-user-certificate" code="25"/>
-      <enum name="application/x-x509-ca-cert" code="26"/>
-      <enum name="application/x-x509-user-cert" code="27"/>
-      <enum name="image/*" code="28"/>
-      <enum name="image/gif" code="29"/>
-      <enum name="image/jpeg" code="30"/>
-      <enum name="image/tiff" code="31"/>
-      <enum name="image/png" code="32"/>
-      <enum name="image/vnd.wap.wbmp" code="33"/>
-      <enum name="application/vnd.wap.multipart.*" code="34"/>
-      <enum name="application/vnd.wap.multipart.mixed" code="35"/>
-      <enum name="application/vnd.wap.multipart.form-data" code="36"/>
-      <enum name="application/vnd.wap.multipart.byteranges" code="37"/>
-      <enum name="application/vnd.wap.multipart.alternative" code="38"/>
-      <enum name="application/xml" code="39"/>
-      <enum name="text/xml" code="40"/>
-      <enum name="application/vnd.wap.wbxml" code="41"/>
-      <enum name="application/x-x968-cross-cert" code="42"/>
-      <enum name="application/x-x968-ca-cert" code="43"/>
-      <enum name="application/x-x968-user-cert" code="44"/>
-      <enum name="text/vnd.wap.si" code="45"/>
-      <enum name="application/vnd.wap.sic" code="46"/>
-      <enum name="text/vnd.wap.sl" code="47"/>
-      <enum name="application/vnd.wap.slc" code="48"/>
-      <enum name="text/vnd.wap.co" code="49"/>
-      <enum name="application/vnd.wap.coc" code="50"/>
-      <enum name="application/vnd.wap.multipart.related" code="51"/>
-      <enum name="application/vnd.wap.sia" code="52"/>
-      <enum name="text/vnd.wap.connectivity-xml" code="53"/>
-      <enum name="application/vnd.wap.connectivity-wbxml" code="54"/>
-      <enum name="application/pkcs7-mime" code="55"/>
-      <enum name="application/vnd.wap.hashed-certificate" code="56"/>
-      <enum name="application/vnd.wap.signed-certificate" code="57"/>
-      <enum name="application/vnd.wap.cert-response" code="58"/>
-      <enum name="application/xhtml+xml" code="59"/>
-      <enum name="application/wml+xml" code="60"/>
-      <enum name="text/css" code="61"/>
-      <enum name="application/vnd.wap.mms-message" code="62"/>
-      <enum name="application/vnd.wap.rollover-certificate" code="63"/>
-      <enum name="application/vnd.wap.locc+wbxml" code="64"/>
-      <enum name="application/vnd.wap.loc+xml" code="65"/>
-      <enum name="application/vnd.syncml.dm+wbxml" code="66"/>
-      <enum name="application/vnd.syncml.dm+xml" code="67"/>
-      <enum name="application/vnd.syncml.notification" code="68"/>
-      <enum name="application/vnd.wap.xhtml+xml" code="69"/>
-      <enum name="application/vnd.wv.csp.cir" code="70"/>
-      <enum name="application/vnd.oma.dd+xml" code="71"/>
-      <enum name="application/vnd.oma.drm.message" code="72"/>
-      <enum name="application/vnd.oma.drm.content" code="73"/>
-      <enum name="application/vnd.oma.drm.rights+xml" code="74"/>
-      <enum name="application/vnd.oma.drm.rights+wbxml" code="75"/>
-      <enum name="application/vnd.wv.csp+xml" code="76"/>
-      <enum name="application/vnd.wv.csp+wbxml" code="77"/>
-      <enum name="application/vnd.syncml.ds.notification" code="78"/>
-      <enum name="audio/*" code="79"/>
-      <enum name="video/*" code="80"/>
-      <enum name="application/vnd.oma.dd2+xml" code="81"/>
-      <enum name="application/mikey" code="82"/>
-      <enum name="application/vnd.oma.dcd" code="83"/>
-      <enum name="application/vnd.oma.dcdc" code="84"/>
-    </avp>
-               <avp name="Additional-Type-Information" code="1205" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="UTF8String"/>
-               </avp>
-    <avp name="Content-Size" code="1206" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="Unsigned32"/>
+                       <enum name="MME" code="0"/>
+                       <enum name="SGSN" code="1"/>
+                       <enum name="MME/SGSN" code="2"/>
                </avp>
-    <avp name="Additional-Content-Information" code="1207" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-      <grouped>
-        <gavp name="Type-Number"/>
-        <gavp name="Additional-Type-Information"/>
-        <gavp name="Content-Size"/>
-                       </grouped>
-    </avp>
-    <avp name="Addressee-Type AVP" code="1208" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-      <type type-name="Enumerated"/>
-      <enum name="TO" code="0"/>
-      <enum name="CC" code="1"/>
-      <enum name="BCC" code="2"/>
-    </avp>
-    <avp name="Priority" code="1209" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+               <avp name="PDN-Type" code="1456" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
                        <type type-name="Enumerated"/>
-                       <enum name="Low" code="0"/>
-                       <enum name="Normal" code="2"/> 
-                       <enum name="High" code="3"/> 
+                       <enum name="IPv4" code="0"/>
+                       <enum name="IPv6" code="1"/>
+                       <enum name="IPv4v6" code="2"/>
                </avp>
-               <avp name="Message-ID" code="1210" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="UTF8String"/>
-               </avp>
-               <avp name="Message-Type" code="1211" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+               <avp name="Roaming-Restricted-Due-To-Unsupported-Feature" code="1457" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
                        <type type-name="Enumerated"/>
-                       <enum name="m-send-req" code="1"/>
-                       <enum name="m-send-conf" code="2"/>
-                       <enum name="m-notification-ind" code="3"/>
-                       <enum name="m-notifyresp-ind" code="4"/>
-                       <enum name="m-retrieve-conf" code="5"/>
-                       <enum name="m-acknowledge-ind" code="6"/>
-                       <enum name="m-delivery-ind" code="7"/>
-                       <enum name="m-read-rec-ind" code="8"/>
-                       <enum name="m-read-orig-ind" code="9"/>
-                       <enum name="m-forward-req" code="10"/>
-                       <enum name="m-forward-conf" code="11"/>
-                       <enum name="m-mbox-store-conf" code="12"/>
-                       <enum name="m-mbox-view-conf" code="13"/>
-                       <enum name="m-mbox-upload-conf" code="14"/>
-                       <enum name="m-mbox-delete-conf" code="15"/>
-               </avp>
-               <avp name="Message-Size" code="1212" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="Unsigned32"/>
+                       <enum name="Roaming-Restricted-Due-To-Unsupported-Feature" code="0"/>
                </avp>
-               <avp name="Message-Class" code="1213" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+               <avp name="Trace-Data" code="1458" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
                        <grouped>
-                               <gavp name="Class-Identifier"/>
-                               <gavp name="Token-Text"/>
+                               <gavp name="Trace-Reference"/>
+                               <gavp name="Trace-Depth"/>
+                               <gavp name="Trace-NE-Type-List"/>
+                               <gavp name="Trace-Interface-List"/>
+                               <gavp name="Trace-Event-List"/>
+                               <gavp name="OMC-Id"/>
+                               <gavp name="Trace-Collection-Entity"/>
                        </grouped>
                </avp>
-               <avp name="Class-Identifier" code="1214" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="Enumerated"/>
-                       <enum name="Personal" code="0"/>
-                       <enum name="Advertisement" code="1"/>
-                       <enum name="Informational" code="2"/>
-                       <enum name="Auto" code="3"/>
-               </avp>
-               <avp name="Token-Text" code="1215">
-                       <type type-name="UTF8String"/>
-               </avp>
-               <avp name="Delivery-Report-Requested" code="1216" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="Enumerated"/>
-                       <enum name="No" code="0"/>
-                       <enum name="Yes" code="1"/>
+               <avp name="Trace-Reference" code="1459" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
                </avp>
-               <avp name="Adaptations" code="1217" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+               <avp name="Trace-Depth" code="1462" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
                        <type type-name="Enumerated"/>
-                       <enum name="No" code="0"/>
-                       <enum name="Yes" code="1"/>
-               </avp>
-               <avp name="Applic-ID" code="1218" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="UTF8String"/>
-               </avp>
-               <avp name="Aux-Applic-Info" code="1219" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="UTF8String"/>
+                       <enum name="Minimum" code="0"/>
+                       <enum name="Medium" code="1"/>
+                       <enum name="Maximum" code="2"/>
+                       <enum name="MinimumWithoutVendorSpecificExtension" code="3"/>
+                       <enum name="MediumWithoutVendorSpecificExtension" code="4"/>
+                       <enum name="MaximumWithoutVendorSpecificExtension" code="5"/>
+                       <!--
+                         The Trace-Depth AVP is of type Enumerated.
+                         The possible values are those defined in 3GPP TS 32.422 [23] for Trace Depth.
+                       -->
+               </avp>
+               <avp name="Trace-NE-Type-List" code="1463" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
                </avp>
-               <avp name="Content-Class" code="1220" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="Enumerated"/>
-                       <enum name="text" code="0"/>
-                       <enum name="image-basic" code="1"/>
-                       <enum name="image-rich" code="2"/>
-                       <enum name="video-basic" code="3"/>
-                       <enum name="video-rich" code="4"/>
-                       <enum name="megapixel" code="5"/>
-                       <enum name="content-basic" code="6"/>
-                       <enum name="content-rich" code="7"/>
+               <avp name="Trace-Interface-List" code="1464" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
                </avp>
-               <avp name="DRM-Content" code="1221">
-                       <type type-name="Enumerated"/>
-                       <enum name="No" code="0"/>
-                       <enum name="Yes" code="1"/>
+               <avp name="Trace-Event-List" code="1465" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
                </avp>
-               <avp name="Read-Reply-Report-Requested" code="1222" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="Enumerated"/>
-      <enum name="No" code="0"/>
-      <enum name="Yes" code="1"/>
-    </avp>
-               <avp name="Reply-Applic-ID" code="1223" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="UTF8String"/>
+               <avp name="OMC-Id" code="1466" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
                </avp>
-               <avp name="File-Repair-Supported" code="1224" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="Enumerated"/>
-                       <enum name="SUPPORTED" code="1"/>
-                       <enum name="NOT_SUPPORTED" code="2"/>
+               <avp name="GPRS-Subscription-Data" code="1467" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Complete-Data-List-Included-Indicator"/>
+                               <gavp name="PDP-Context"/>
+                       </grouped>
                </avp>
-               <avp name="MBMS-User-Service-Type" code="1225" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+               <avp name="Complete-Data-List-Included-Indicator" code="1468" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
                        <type type-name="Enumerated"/>
-                       <enum name="DOWNLOAD" code="1"/>
-                       <enum name="STREAMING" code="2"/>
+                       <enum name="ALL_PDP_CONTEXTS_INCLUDED" code="0"/>
+                       <enum name="MODIFIED/ADDED_PDP CONTEXTS_INCLUDED" code="1"/>
                </avp>
-               <avp name="Unit-Quota-Threshold" code="1226" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="Unsigned32"/>
+               <avp name="PDP-Context" code="1469" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Context-Identifier"/>
+                               <gavp name="PDP-Type"/>
+                               <gavp name="PDP-Address"/>
+                               <gavp name="QoS-Subscribed"/>
+                               <gavp name="VPLMN-Dynamic-Address-Allowed"/>
+                               <gavp name="Service-Selection"/>
+                               <gavp name="3GPP-Charging-Characteristics"/>
+                       </grouped>
                </avp>
-               <avp name="PDP-Address" code="1227" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="IPAddress"/>
+               <avp name="PDP-Type" code="1470" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
                </avp>
-               <avp name="SGSN-Address" code="1228" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="IPAddress"/>
+               <avp name="TGPP2-MEID" code="1471" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
                </avp>
-    <avp name="PoC-Session-Id" code="1229" mandatory="must" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="UTF8String"/>
+               <avp name="Specific-APN-Info" code="1472" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Service-Selection"/>
+                               <gavp name="MIP6-Agent-Info"/>
+                       </grouped>
                </avp>
-               <avp name="Deferred-Location-Event-Type" code="1230" mandatory="must"  may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="UTF8String"/>
+               <avp name="LCS-Info" code="1473" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="GMLC-Address"/>
+                               <gavp name="LCS-PrivacyException"/>
+                               <gavp name="MO-LR"/>
+                       </grouped>
                </avp>
-               <avp name="LCS-APN" code="1231" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="UTF8String"/>
+               <avp name="GMLC-Address" code="1474" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
                </avp>
-               <avp name="LCS-Client-ID" code="1232" mandatory="may" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+               <avp name="LCS-PrivacyException" code="1475" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
                        <grouped>
-                               <gavp name="LCS-Client-Type"/>
-                               <gavp name="LCS-Client-External-ID"/>
-                               <gavp name="LCS-Client-Dialed-By-MS"/>
-                               <gavp name="LCS-Client-Name"/>
-                               <gavp name="LCS-APN"/>
-                               <gavp name="LCS-Requestor-ID"/>
+                               <gavp name="SS-Code"/>
+                               <gavp name="SS-Status"/>
+                               <gavp name="Notification-To-UE-User"/>
+                               <gavp name="External-Client"/>
+                               <gavp name="PLMN-Client"/>
+                               <gavp name="Service-Type"/>
                        </grouped>
                </avp>
-               <avp name="LCS-Client-Dialed-By-MS" code="1233" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="UTF8String"/>
+               <avp name="SS-Code" code="1476" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
                </avp>
-               <avp name="LCS-Client-External-ID" code="1234" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="UTF8String"/>
+               <avp name="SS-Status" code="1477" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
                </avp>
-               <avp name="LCS-Client-Name" code="1235" mandatory="may"  vendor-bit="must" vendor-id="TGPP">
+               <avp name="Notification-To-UE-User" code="1478" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="NOTIFY_LOCATION_ALLOWED" code="0"/>
+                       <enum name="NOTIFYANDVERIFY_LOCATION_ALLOWED_IF_NO_RESPONSE" code="1"/>
+                       <enum name="NOTIFYANDVERIFY_LOCATION_NOT_ALLOWED_IF_NO_RESPONSE" code="2"/>
+                       <enum name="LOCATION_NOT_ALLOWED" code="3"/>
+               </avp>
+               <avp name="External-Client" code="1479" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
                        <grouped>
-                               <gavp name="LCS-Data-Coding-Scheme"/>
-                               <gavp name="LCS-Name-String"/>
-                               <gavp name="LCS-Format-Indicator"/>
+                               <gavp name="Client-Identity"/>
+                               <gavp name="GMLC-Restriction"/>
+                               <gavp name="Notification-To-UE-User"/>
                        </grouped>
                </avp>
-               <avp name="LCS-Data-Coding-Scheme" code="1236" mandatory="must" may-encrypt="yes" protected="may"  vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="UTF8String"/>
+               <avp name="Client-Identity" code="1480" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
                </avp>
-               <avp name="LCS-Format-Indicator" code="1237" mandatory="may"  vendor-bit="must" vendor-id="TGPP">
+               <avp name="GMLC-Restriction" code="1481" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
                        <type type-name="Enumerated"/>
-                       <enum name="LOGICAL_NAME" code="0"/>
-                       <enum name="EMAIL_ADDRESS" code="1"/>
-                       <enum name="MSISDN" code="2"/>
-                       <enum name="URL" code="3"/>
-                       <enum name="SIP_URL" code="4"/>
+                       <enum name="GMLC_LIST" code="0"/>
+                       <enum name="HOME_COUNTRY" code="1"/>
                </avp>
-               <avp name="LCS-Name-String" code="1238" mandatory="must" may-encrypt="yes" protected="may"  vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="UTF8String"/>
+               <avp name="PLMN-Client" code="1482" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="BROADCAST_SERVICE" code="0"/>
+                       <enum name="O_AND_M_HPLMN" code="1"/>
+                       <enum name="O_AND_M_VPLMN" code="2"/>
+                       <enum name="ANONYMOUS_LOCATION" code="3"/>
+                       <enum name="TARGET_UE_SUBSCRIBED_SERVICE" code="4"/>
                </avp>
-               <avp name="LCS-Requestor-ID" code="1239" mandatory="may" vendor-bit="must" vendor-id="TGPP">
+               <avp name="Service-Type" code="1483" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
                        <grouped>
-                               <gavp name="LCS-Data-Coding-Scheme"/>
-                               <gavp name="LCS-Requestor-ID-String"/>
+                               <gavp name="ServiceTypeIdentity"/>
+                               <gavp name="GMLC-Restriction"/>
+                               <gavp name="Notification-To-UE-User"/>
                        </grouped>
                </avp>
-               <avp name="LCS-Requestor-ID-String" code="1240" mandatory="must" may-encrypt="yes" protected="may"  vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="UTF8String"/>
+               <avp name="ServiceTypeIdentity" code="1484" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="Unsigned32"/>
                </avp>
-               <avp name="LCS-Client-Type" code="1241" mandatory="may" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="Enumerated"/>
-                       <enum name="EMERGENCY_SERVICES" code="0"/>
-                       <enum name="VALUE_ADDED_SERVICES" code="1"/>
-                       <enum name="PLMN_OPERATOR_SERVICES" code="2"/>
-                       <enum name="LAWFUL_INTERCEPT_SERVICES" code="3"/>
+               <avp name="MO-LR" code="1485" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="SS-Code"/>
+                               <gavp name="SS-Status"/>
+                       </grouped>
                </avp>
-               <avp name="Location-Estimate" code="1242" mandatory="must" may-encrypt="yes" protected="may"  vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="UTF8String"/>
+               <avp name="Teleservice-List" code="1486" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="TS-Code"/>
+                       </grouped>
                </avp>
-               <avp name="Location-Estimate-Type" code="1243" mandatory="may" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="Enumerated"/>
-                       <enum name="CURRENT_LOCATION" code="0"/>
-                       <enum name="CURRENT_LAST_KNOWN_LOCATION" code="1"/>
-                       <enum name="INITIAL_LOCATION" code="2"/>
-                       <enum name="ACTIVATE_DEFERRED_LOCATION" code="3"/>
-                       <enum name="CANCEL_DEFERRED_LOCATION" code="4"/>
+               <avp name="TS-Code" code="1487" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
                </avp>
-               <avp name="Location-Type" code="1244" mandatory="may" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+               <avp name="Call-Barring-Infor-List" code="1488" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
                        <grouped>
-                               <gavp name="Location-Estimate-Type"/>
-                               <gavp name="Deferred-Location-Event-Type"/>
+                               <gavp name="SS-Code"/>
                        </grouped>
                </avp>
-               <avp name="Positioning-Data" code="1245" mandatory="must" may-encrypt="yes" protected="may"  vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="UTF8String"/>
+               <avp name="SGSN-Number" code="1489" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
                </avp>
-               <avp name="WLAN-Session-Id" code="1246" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="UTF8String"/>
+               <avp name="IDR-Flags" code="1490" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="Unsigned32"/>
                </avp>
-               <avp name="PDP-Context-Type" code="1247" vendor-bit="must" vendor-id="TGPP">
+               <avp name="ICS-Indicator" code="1491" vendor-bit="must" mandatory="mustnot" may-encrypt="no" vendor-id="TGPP">
                        <type type-name="Enumerated"/>
-                       <enum name="PRIMARY" code="0"/>
-                       <enum name="SECONDARY" code="1"/>
+                       <enum name="FALSE" code="0"/>
+                       <enum name="TRUE" code="1"/>
                </avp>
-               <avp name="MMBox-Storage-Requested" code="1248" vendor-bit="must" vendor-id="TGPP">
+               <avp name="IMS-Voice-Over-PSSessions-Supported" code="1492"  vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
                        <type type-name="Enumerated"/>
-                       <enum name="No" code="0"/>
-                       <enum name="Yes" code="1"/>
+                       <enum name="NOT_SUPPORTED" code="0"/>
+                       <enum name="SUPPORTED" code="1"/>
                </avp>
-               <avp name="Service-Specific-Info" code="1249" vendor-bit="must" vendor-id="TGPP">
-      <grouped>
-        <gavp name="Service-Specific-Data"/>
-        <gavp name="Service-Specific-Type"/>
-      </grouped>
-    </avp>
-               <avp name="Called-Asserted-Identity" code="1250" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="UTF8String"/>
+               <avp name="Homogeneous-Support-of-IMS-Voice-Over-PS-Sessions" code="1493" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="NOT_SUPPORTED" code="0"/>
+                       <enum name="SUPPORTED" code="1"/>
                </avp>
-               <avp name="Requested-Party-Address" code="1251" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="UTF8String"/>
+               <avp name="Last-UE-Activity-Time" code="1494" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="Time"/>
                </avp>
-               <avp name="PoC-User-Role" code="1252" vendor-bit="must" vendor-id="TGPP">
+               <avp name="EPS-User-State" code="1495" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
                        <grouped>
-                               <gavp name="PoC-User-Role-Ids"/>
-                               <gavp name="PoC-User-Role-info-Units"/>
+                               <gavp name="MME-User-State"/>
+                               <gavp name="SGSN-User-State"/>
                        </grouped>
                </avp>
-               <avp name="PoC-User-Role-IDs" code="1253" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="UTF8String"/>
+               <avp name="EPS-Location-Information" code="1496" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="MME-Location-Information"/>
+                               <gavp name="SGSN-Location-Information"/>
+                       </grouped>
                </avp>
-               <avp name="PoC-User-Role-info-Units" code="1254" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="Enumerated"/>
-                       <enum name="Moderator" code="1"/>
-        <enum name="Dispatcher" code="2"/>
-        <enum name="Session-Owner" code="3"/>
-        <enum name="Session-Participant" code="4"/>
-    </avp>
-
-               <avp name="Talk-Burst-Exchange" code="1255" vendor-bit="must" vendor-id="TGPP">
+               <avp name="MME-User-State" code="1497" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
                        <grouped>
-        <gavp name="PoC-Change-Time"/>
-        <gavp name="Number-Of-Talk-Bursts"/>
-        <gavp name="Talk-Burst-Volume"/>
-        <gavp name="Talk-Burst-Time"/>
-        <gavp name="Number-Of-Received-Talk-Bursts"/>
-        <gavp name="Received-Talk-Burst-Volume"/>
-        <gavp name="Received-Talk-Burst-Time"/>
-        <gavp name="Number-Of-Participants"/>
-        <gavp name="PoC-Change-Condition"/>
-      </grouped>
+                               <gavp name="User-State"/>
+                       </grouped>
                </avp>
-               <avp name="Service-Generic-Information" code="1256" vendor-bit="must" vendor-id="TGPP">
-      <grouped>
-      </grouped>
-    </avp>
-               <avp name="Service-Specific-Type" code="1257" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="Unsigned32"/>
+               <avp name="SGSN-User-State" code="1498" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="User-State"/>
+                       </grouped>
                </avp>
-               <avp name="Event-Charging-TimeStamp" code="1258" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="Time"/>
+               <avp name="User-State" code="1499" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="DETACHED" code="0"/>
+                       <enum name="ATTACHED_NOT_REACHABLE_FOR_PAGING" code="1"/>
+                       <enum name="ATTACHED_REACHABLE_FOR_PAGING" code="2"/>
+                       <enum name="CONNECTED_NOT_REACHABLE_FOR_PAGING" code="3"/>
+                       <enum name="CONNECTED_REACHABLE_FOR_PAGING" code="4"/>
+                       <enum name="NETWORK_DETERMINED_NOT_REACHABLE" code="5"/>
+               </avp>
+               <avp name="Non-3GPP-User-Data" code="1500" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Subscription-ID"/>
+                               <gavp name="Non-3GPP-IP-Access"/>
+                               <gavp name="Non-3GPP-IP-Access-APN"/>
+                               <gavp name="RAT-Type"/>
+                               <gavp name="Session-Timeout"/>
+                               <gavp name="MIP6-Feature-Vector"/>
+                               <gavp name="AMBR"/>
+                               <gavp name="3GPP-Charging-Characteristics"/>
+                               <gavp name="APN-OI-Replacement"/>
+                               <gavp name="APN-Configuration"/>
+                               <gavp name="Trace-Info"/>
+                       </grouped>
                </avp>
-               <avp name="Participant-Access-Priority" code="1259" vendor-bit="must" vendor-id="TGPP">
+               <avp name="Non-3GPP-IP-Access" code="1501" vendor-bit="must" mandatory="mustnot" may-encrypt="no" vendor-id="TGPP">
                        <type type-name="Enumerated"/>
-      <enum name="Pre-emptive priority" code="1"/>
-      <enum name="High priority" code="2"/>
-      <enum name="Normal priority" code="3"/>
-      <enum name="Low priority" code="4"/>
-    </avp>
-               <avp name="Participant-Group" code="1260" vendor-bit="must" vendor-id="TGPP">
-      <grouped>
-        <gavp name="Called-Party-Address"/>
-        <gavp name="Participant-Access-Priority"/>
-        <gavp name="User-Participating-Type"/>
-      </grouped>
-    </avp>
-               <avp name="PoC-Change-Condition" code="1261" vendor-bit="must" vendor-id="TGPP">
+                       <enum name="NON_3GPP_SUBSCRIPTION_ALLOWED" code="0"/>
+                       <enum name="NON_3GPP_SUBSCRIPTION_BARRED" code="1"/>
+               </avp>
+               <avp name="Non-3GPP-IP-Access-APN" code="1502" vendor-bit="must" mandatory="mustnot" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="NON_3GPP_APNS_ENABLE" code="0"/>
+                       <enum name="NON_3GPP_APNS_DISABLE" code="1"/>
+               </avp>
+               <avp name="AN-Trusted" code="1503" vendor-bit="must" mandatory="mustnot" may-encrypt="no" vendor-id="TGPP">
                        <type type-name="Enumerated"/>
-      <enum name="serviceChange" code="0"/>
-      <enum name="volumeLimit" code="1"/>
-      <enum name="timeLimit" code="2"/>
-      <enum name="numberofTalkBurstLimit" code="3"/>
-      <enum name="numberofActiveParticipants" code="4"/>
-      <enum name="tariffTime" code="5"/>
+                       <enum name="TRUSTED" code="0"/>
+                       <enum name="UNTRUSTED" code="1"/>
+               </avp>
+               <avp name="ANID" code="1504" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="Trace-Info" code="1505" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Trace-Data"/>
+                               <gavp name="Trace-Reference"/>
+                       </grouped>
+               </avp>
+    <avp name="MIP-FA-RK" may-encrypt="yes" vendor-id="TGPP" vendor-bit="must" mandatory="must" code="1506">
+      <type type-name="OctetString"/>
     </avp>
-               <avp name="PoC-Change-Time" code="1262" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="Time"/>
+    <avp name="MIP-FA-RK-SPI" may-encrypt="yes" vendor-id="TGPP" vendor-bit="must" mandatory="must" code="1507">
+      <type type-name="Unsigned32"/>
+    </avp>    
+<!--
+Note: The AVP codes from 1485 to 1499 are reserved for TS 29.272.
+Note: The AVP codes from 1506 to 1599 are reserved for TS 29.273
+-->
+               <avp name="MME-Location-Information" code="1600" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="E-UTRAN-Cell-Global-Identity"/>
+                               <gavp name="Tracking-Area-Identity"/>
+                               <gavp name="Geographical-Information"/>
+                               <gavp name="Geodetic-Information"/>
+                               <gavp name="Current-Location-Retrieved"/>
+                               <gavp name="Age-Of-Location-Information"/>
+                       </grouped>
                </avp>
-               <avp name="Access-Network-Information" code="1263" vendor-bit="must" vendor-id="TGPP">
+               <avp name="SGSN-Location-Information" code="1601" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Cell-Global-Identity"/>
+                               <gavp name="Location-Area-Identity"/>
+                               <gavp name="Service-Area-Identity"/>
+                               <gavp name="Routing-Area-Identity"/>
+                               <gavp name="Geographical-Information"/>
+                               <gavp name="Geodetic-Information"/>
+                               <gavp name="Current-Location-Retrieved"/>
+                               <gavp name="Age-Of-Location-Information"/>
+                       </grouped>
+               </avp>
+               <avp name="E-UTRAN-Cell-Global-Identity" code="1602" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="OctetString"/>
                </avp>
-               <avp name="Trigger" code="1264" vendor-bit="must" vendor-id="TGPP">
-                                       <grouped>
-                                       <gavp name="Trigger-Type_3GPP"/>
-                                       </grouped>
+               <avp name="Tracking-Area-Identity" code="1603" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
                </avp>
-               <avp name="Base-Time-Interval" code="1265" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="Unsigned32"/>
+               <avp name="Cell-Global-Identity" code="1604" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
                </avp>
-               <avp name="Envelope" code="1266" vendor-bit="must" vendor-id="TGPP">
-                                       <grouped>
-                                       <gavp name="Envelope-Start-Time"/>
-                                       <gavp name="Envelope-End-Time"/>
-                                       <gavp name="CC-Total-Octets"/>
-                                       <gavp name="CC-Input-Octets"/>
-                                       <gavp name="CC-Output-Octets"/>
-                                       <gavp name="CC-Service-Specific-Units"/>
-                                       </grouped>
+               <avp name="Routing-Area-Identity" code="1605" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
                </avp>
-               <avp name="Envelope-End-Time" code="1267" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="Time"/>
+               <avp name="Location-Area-Identity" code="1606" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
                </avp>
-               <avp name="Envelope-Reporting" code="1268" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="Enumerated"/>
-      <enum name="DO_NOT_REPORT_ENVELOPES" code="0"/>
-      <enum name="REPORT_ENVELOPES" code="1"/>
-      <enum name="REPORT_ENVELOPES_WITH_VOLUME" code="2"/>
-      <enum name="REPORT_ENVELOPES_WITH_EVENTS" code="3"/>
-      <enum name="REPORT_ENVELOPES_WITH_VOLUME_AND_EVENTS" code="4"/>
-    </avp>
-               <avp name="Envelope-Start-Time" code="1269" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="Time"/>
+               <avp name="Service-Area-Identity" code="1607" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
                </avp>
-               <avp name="Time-Quota-Mechanism" code="1270" vendor-bit="must" vendor-id="TGPP">
-                                       <grouped>
-            <gavp name="Time-Quota-Type"/>
-            <gavp name="Base-Time-Interval"/>
-          </grouped>
-               </avp>  
-               <avp name="Time-Quota-Type" code="1271" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="Enumerated"/>
-      <enum name="DISCRETE_TIME_PERIOD" code="0"/>
-      <enum name="CONTINUOUS_TIME_PERIOD" code="1"/>
-    </avp>
-               <avp name="Early-Media-Description" code="1272" vendor-bit="must" vendor-id="TGPP">
-                                       <grouped>
-            <gavp name="SDP-TimeStamps"/>
-            <gavp name="SDP-Media-Component"/>
-            <gavp name="SDP-Session-Description"/>
-          </grouped>
+               <avp name="Geographical-Information" code="1608" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
                </avp>
-               <avp name="SDP-TimeStamps" code="1273" vendor-bit="must" vendor-id="TGPP">
-                                       <grouped>
-            <gavp name="SDP-Offer-Timestamp"/>
-            <gavp name="SDP-Answer-Timestamp"/>
-          </grouped>
+               <avp name="Geodetic-Information" code="1609" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
                </avp>
-               <avp name="SDP-Offer-Timestamp" code="1274" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="Time"/>
+
+<!--
+1610 Current-Location-Retrieved Enumerated
+1611 Age-Of-Location-Information Unsigned32
+1612 Active-APN Grouped
+1613   SIPTO-Permission        Enumerated
+1614   Error-Diagnostic        Enumerated
+1615   UE-SRVCC-Capability     Enumerated
+1616   MPS-Priority    Unsigned32
+1617   VPLMN-LIPA-Allowed      Enumerated
+1618   LIPA-Permission Enumerated
+1619   Subscribed-Periodic-RAU-TAU-Timer       Unsigned32
+1620   Ext-PDP-Type    OctetString
+1621   Ext-PDP-Address Address
+1622   MDT-Configuration       Grouped
+1623   Job-Type        Enumerated
+1624   Area-Scope      Grouped
+1625   List-Of-Measurements    Unsigned32
+1626   Reporting-Trigger       Unsigned32
+1627   Report-Interval Enumerated
+1628   Report-Amount   Enumerated
+1629   Event-ThresholdRSRP     Unsigned32
+1630   Event-ThresholdRSRQ     Unsigned32
+1631   Logging-Interval        Enumerated
+1632   Logging-Duration        Enumerated
+1633   Relay-Node-Indicator    Enumerated
+
+Note: The AVP codes from 1634 to 1699 are reserved for TS 29.272.
+-->
+               <avp name="SMS-Information" code="2000" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="SMS-Node"/>
+                               <gavp name="Client-Address"/>
+                               <gavp name="Originator-SCCP-Address"/>
+                               <gavp name="Recipient-SCCP-Address"/>
+                               <gavp name="SMSC-Address"/>
+                               <gavp name="Data-Coding-Scheme"/>
+                               <gavp name="Destination-Interface"/>
+                               <gavp name="SM-Discharge-Time"/>
+                               <gavp name="SM-Message-Type"/>
+                               <gavp name="Originator-Interface"/>
+                               <gavp name="SM-Protocol-ID"/>
+                               <gavp name="Reply-Path-Requested"/>
+                               <gavp name="SM-Status"/>
+                               <gavp name="SM-User-Data-Header"/>
+                               <gavp name="Number-Of-Messages-Sent"/>
+                               <gavp name="Recipients"/>
+                       </grouped>
                </avp>
-               <avp name="SDP-Answer-Timestamp" code="1275" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="Time"/>
+               <avp name="Data-Coding-Scheme" code="2001" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Integer32"/>
                </avp>
-               <avp name="AF-Correlation-Information" code="1276" vendor-bit="must" vendor-id="TGPP">
-                                       <grouped>
-            <gavp name="AF-Charging-Identifier"/>
-            <gavp name="Flows"/>
-          </grouped>
-               </avp>  
-               <avp name="PoC-Session-Initiation-type" code="1277" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="Enumerated"/>
-      <enum name="Pre-established" code="0"/>
-      <enum name="On-demand" code="1"/>
-    </avp>
-               <avp name="Offline-Charging" code="1278" vendor-bit="must" vendor-id="TGPP">
-                                       <grouped>
-            <gavp name="Quota-Consumption-Time"/>
-            <gavp name="Time-Quota-Mechanism"/>
-            <gavp name="Envelope-Reporting"/>
-            <gavp name="Multiple-Services-Credit-Control"/>
-          </grouped>
+               <avp name="Destination-Interface" code="2002" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Interface-Id"/>
+                               <gavp name="Interface-Text"/>
+                               <gavp name="Interface-Port"/>
+                               <gavp name="Interface-Type"/>
+                       </grouped>
                </avp>
-               <avp name="User-Participating-Type" code="1279" vendor-bit="must" vendor-id="TGPP">
-                       <type type-name="Enumerated"/>
-      <enum name="Normal" code="0"/>
-      <enum name="NW PoC Box" code="1"/>
-      <enum name="UE PoC Box" code="2"/>
-    </avp>     
-               <avp name="Alternate-Charged-Party-Address" code="1280" vendor-bit="must" vendor-id="TGPP">
+               <avp name="Interface-Id" code="2003" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="UTF8String"/>
                </avp>
-               <avp name="IMS-Communication-Service-Identifier" code="1281" vendor-bit="must" vendor-id="TGPP">
+               <avp name="Interface-Port" code="2004" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="UTF8String"/>
                </avp>
-    <avp name="Number-Of-Received-Talk-Bursts" code="1282" vendor-bit="must" vendor-id="TGPP">
-      <type type-name="Unsigned32"/>
-    </avp>
-    <avp name="Number-Of-Talk-Bursts" code="1283" vendor-bit="must" vendor-id="TGPP">
-      <type type-name="Unsigned32"/>
-    </avp>
-    <avp name="Received-Talk-Burst-Time" code="1284" vendor-bit="must" vendor-id="TGPP">
-      <type type-name="Unsigned32"/>
-    </avp>
-    <avp name="Received-Talk-Burst-Volume" code="1285" vendor-bit="must" vendor-id="TGPP">
-      <type type-name="Unsigned32"/>
-    </avp>
-    <avp name="Talk-Burst-Time" code="1286" vendor-bit="must" vendor-id="TGPP">
-      <type type-name="Unsigned32"/>
-    </avp>
-    <avp name="Talk-Burst-Volume" code="1287" vendor-bit="must" vendor-id="TGPP">
-      <type type-name="Unsigned32"/>
-    </avp>
-               <avp name="Media-Initiator-Party" code="1288" vendor-bit="must" vendor-id="TGPP">
+               <avp name="Interface-Text" code="2005" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="UTF8String"/>
                </avp>
-    <!-- 
-Note: The AVP codes from 1289 to 1399 are reserved for TS 32.299
--->
-<!--    
-3GPP TS 29.272 V8.1.1 (2009-01
--->
-               <avp name="Subscription-Data" code="1400" vendor-bit="must" vendor-id="TGPP">
-       <type type-name="Grouped"/>
-                                       <gavp name="Subscriber-Status"/>
-                                       <gavp name="MSISDN"/> 
-                                       <gavp name="STN-SR"/> 
-                                       <gavp name="Network-Access-Mode"/>
-                                       <gavp name="Operator-Determined-Barring"/>
-                                       <gavp name="HPLMN-ODB"/>
-                                       <gavp name="Regional-Subscription-Zone-Code"/>
-                                       <gavp name="Access-Restriction-Data"/>
-                                       <gavp name="APN-OI-Replacement"/>
-                                       <gavp name="3GPP-Charging-Characteristics"/> 
-                                       <gavp name="AMBR"/>
-                                       <gavp name="APN-Configuration-Profile"/>
-                                       <gavp name="RAT-Frequency-Selection-Priority-ID"/>
-                                       <gavp name="Trace-Data"/>
-                                       <gavp name="GPRS-Subscription Data"/>
-                                       <gavp name="CSG-Subscription-Data"/> 
-                                       <gavp name="Roaming-Restricted-Due-To-Unsupported-Feature"/>
-
-               </avp>
-               <avp name="Terminal-Information" code="1401" vendor-bit="must" vendor-id="TGPP">
-       <type type-name="Grouped"/>
-                                       <gavp name="IMEI"/> 
-                                       <gavp name="3GPP2-MEID"/>
-                                       <gavp name="Software-Version"/>
-               </avp>
-               <avp name="IMEI" code="1402" vendor-bit="must" vendor-id="TGPP">
-       <type type-name="UTF8String"/>
-               </avp>
-               <avp name="Software-Version" code="1403" vendor-bit="must" vendor-id="TGPP">
-       <type type-name="UTF8String"/>
+               <avp name="Interface-Type" code="2006" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="Unknown" code="0"/>
+                       <enum name="MOBILE_ORIGINATING" code="1"/>
+                       <enum name="MOBILE_TERMINATING" code="2"/>
+                       <enum name="APPLICATION_ORIGINATING" code="3"/>
+                       <enum name="APPLICATION_TERMINATION" code="4"/>
                </avp>
-               <avp name="ULR-Flags" code="1405" vendor-bit="must" vendor-id="TGPP">
-       <type type-name="Unsigned32"/>
+               <avp name="SM-Message-Type" code="2007" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="SUBMISSION" code="0"/>
+                       <enum name="DELIVERY_REPORT" code="1"/>
+                       <enum name="SM Service Request" code="2"/>
                </avp>
-               <avp name="ULA-Flags" code="1406" vendor-bit="must" vendor-id="TGPP">
-       <type type-name="Unsigned32"/>
+               <avp name="Originating-SCCP-Address" code="2008" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="IPAddress"/>
                </avp>
-               <avp name="Visited-PLMN-Id" code="1407" vendor-bit="must" vendor-id="TGPP">
-       <type type-name="OctetString"/>
+               <avp name="Originator-Interface" code="2009" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Interface-Id"/>
+                               <gavp name="Interface-Text"/>
+                               <gavp name="Interface-Port"/>
+                               <gavp name="Interface-Type"/>
+                       </grouped>
                </avp>
-               <avp name="Requested-EUTRAN-Authentication-Info" code="1408" vendor-bit="must" vendor-id="TGPP">
-       <type type-name="Grouped"/>
-                                       <gavp name="Number-Of-Requested-Vectors"/>
-                                       <gavp name="Immediate-Response-Preferred"/>
-                                       <gavp name="Re-synchronization-Info"/>
+               <avp name="Recipient-SCCP-Address" code="2010" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="IPAddress"/>
                </avp>
-               <avp name="Requested-UTRAN-GERAN-Authentication-Info" code="1409" vendor-bit="must" vendor-id="TGPP">
-       <type type-name="Grouped"/>
-                                       <gavp name="Number-Of-Requested-Vectors"/>
-                                       <gavp name="Immediate-Response-Preferred"/>
-                                       <gavp name="Re-synchronization-Info"/>
+               <avp name="Reply-Path-Requested" code="2011" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="No Reply Path Set" code="0"/>
+                       <enum name="Reply path Set" code="1"/>
                </avp>
-               <avp name="Number-Of-Requested-Vectors" code="1410" vendor-bit="must" vendor-id="TGPP">
-       <type type-name="Unsigned32"/>
+               <avp name="SM-Discharge-Time" code="2012" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Time"/>
                </avp>
-               <avp name="Re-Synchronization-Info" code="1411" vendor-bit="must" vendor-id="TGPP">
-       <type type-name="OctetString"/>
+               <avp name="SM-Protocol-ID" code="2013" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
                </avp>
-               <avp name="Immediate-Response-Preferred" code="1412" vendor-bit="must" vendor-id="TGPP">
-       <type type-name="Unsigned32"/>
+               <avp name="SM-Status" code="2014" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
                </avp>
-               <avp name="Authentication-Info" code="1413" vendor-bit="must" vendor-id="TGPP">
-       <type type-name="Grouped"/>
-                                       <gavp name="E-UTRAN-Vector"/> 
-                                       <gavp name="UTRAN-Vector"/>
-                                       <gavp name="GERAN-Vector"/>
-               </avp>    
-               <avp name="E-UTRAN-Vector"      code="1414" vendor-bit="must" vendor-id="TGPP">
-       <type type-name="Grouped"/>
-                                       <gavp name="Item-Number"/>
-                                       <gavp name="RAND"/>
-                                       <gavp name="XRES"/>
-                                       <gavp name="AUTN"/>
-                                       <gavp name="KASME"/>
+               <avp name="SM-User-Data-Header" code="2015" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
                </avp>
-               <avp name="UMTS-Vector" code="1415" vendor-bit="must" vendor-id="TGPP">
-       <type type-name="Grouped"/>
-                                       <gavp name="Item-Number"/>
-                                       <gavp name="RAND"/>
-                                       <gavp name="XRES"/>
-                                       <gavp name="AUTN"/>
-                                       <gavp name="Confidentiality-Key"/>
-                                       <gavp name="Integrity-Key"/>
+               <avp name="SMS-Node" code="2016" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="SMS Router" code="0"/>
+                       <enum name="IP-SM-GW" code="1"/>
+                       <enum name="SMS Router and IP-SM-GW" code="2"/>
+                       <enum name="SMS-SC" code="3"/>
                </avp>
-               <avp name="GERAN-Vector" code="1416" vendor-bit="must" vendor-id="TGPP">
-       <type type-name="Grouped"/>
-                                       <gavp name="Item-Number"/>
-                                       <gavp name="RAND"/>
-                                       <gavp name="SRES"/>
-                                       <gavp name="Kc"/>
+               <avp name="SMSC-Address" code="2017" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="IPAddress"/>
                </avp>
-               <avp name="Network-Access-Mode" code="1417" vendor-bit="must" vendor-id="TGPP">
-       <type type-name="Enumerated"/>
-      <enum name="PACKET_AND_CIRCUIT" code="0"/>
-      <enum name="ONLY_CIRCUIT" code="1"/>
-      <enum name="ONLY_PACKET" code="2"/>
+               <avp name="Client-Address" code="2018" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="IPAddress"/>
                </avp>
-               <avp name="HPLMN-ODB" code="1418" vendor-bit="must" vendor-id="TGPP">
-       <type type-name="Unsigned32"/>
+               <avp name="Number-of-Messages-Sent" code="2019" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Unsigned32"/>
                </avp>
-               <avp name="Item-Number" code="1419" vendor-bit="must" vendor-id="TGPP">
-       <type type-name="Unsigned32"/>
+               <avp name="Low-Balance-Indication" code="2020" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="NOT-APPLICABLE" code="0"/>
+                       <enum name="YES" code="1"/>
                </avp>
-               <avp name="Cancellation-Type" code="1420" vendor-bit="must" vendor-id="TGPP">
-       <type type-name="Enumerated"/>
-      <enum name="MME_UPDATE_PROCEDURE" code="0"/>
-      <enum name="SGSN_UPDATE_PROCEDURE" code="1"/>
-      <enum name="SUBSCRIPTION_WITHDRAWAL" code="2"/>
-      <enum name="UPDATE_PROCEDURE_IWF" code="3"/>
+               <avp name="Remaining-Balance" code="2021" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Unit-Value"/>
+                               <gavp name="Currency-Code"/>
+                       </grouped>
                </avp>
-               <avp name="DSR-Flags" code="1421" vendor-bit="must" vendor-id="TGPP">
-       <type type-name="Unsigned32"/>
+               <avp name="Refund-Information" code="2022" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
                </avp>
-               <avp name="DSA-Flags" code="1422" vendor-bit="must" vendor-id="TGPP">
-       <type type-name="Unsigned32"/>
+               <avp name="Carrier-Select-Routing-Information" code="2023" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
                </avp>
-               <avp name="Context-Identifier" code="1423" vendor-bit="must" vendor-id="TGPP">
-       <type type-name="Unsigned32"/>
+               <avp name="Number-Portability-Routing-Information" code="2024" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
                </avp>
-               <avp name="Subscriber-Status" code="1424" vendor-bit="must" vendor-id="TGPP">
-       <type type-name="Enumerated"/>
-      <enum name="SERVICE_GRANTED" code="0"/>
-      <enum name="OPERATOR_DETERMINED_BARRING" code="1"/>
+               <avp name="PoC-Event-Type" code="2025" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="Normal" code="0"/>
+                       <enum name="Instant Personal Aalert event" code="1"/>
+                       <enum name="PoC Group Advertisement event" code="2"/>
+                       <enum name="Early Ssession Setting-up event" code="3"/>
+                       <enum name="PoC Talk Burst" code="4"/>
                </avp>
-               <avp name="Operator-Determined-Barring" code="1425" vendor-bit="must" vendor-id="TGPP">
-       <type type-name="Unsigned32"/>
+               <avp name="Recipients" code="2026" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Recipient-Address"/>
+                       </grouped>
                </avp>
-               <avp name="Access-Restriction-Data" code="1426" vendor-bit="must" vendor-id="TGPP">
-       <type type-name="Unsigned32"/>
+               <avp name="Destination-Interface" code="2027" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Address-Type"/>
+                               <gavp name="Address-Data"/>
+                               <gavp name="Address-Domain"/>
+                       </grouped>
                </avp>
-               <avp name="APN-OI-Replacement" code="1427" vendor-bit="must" vendor-id="TGPP">
-       <type type-name="UTF8String"/>
+               <avp name="Recipient-Received-Address" code="2028" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Address-Type"/>
+                               <gavp name="Address-Data"/>
+                               <gavp name="Address-Domain"/>
+                       </grouped>
                </avp>
-               <avp name="All-APN-Configurations-Included-Indicator" code="1428" vendor-bit="must" vendor-id="TGPP">
-       <type type-name="Enumerated"/>
-      <enum name="ALL_APN_CONFIGURATIONS_INCLUDED " code="0"/>
-      <enum name="MODIFIED/ADDED_APN_CONFIGURATIONS_INCLUDED" code="1"/>
+               <avp name="SM-Service-Type" code="2029" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="VAS4SMS Short Message content processing" code="0"/>
+                       <enum name="VAS4SMS Short Message forwarding" code="1"/>
+                       <enum name="VAS4SMS Short Message Forwarding multiple subscriptions" code="2"/>
+                       <enum name="VAS4SMS Short Message filtering" code="3"/>
+                       <enum name="VAS4SMS Short Message receipt" code="4"/>
+                       <enum name="VAS4SMS Short Message Network Storage" code="5"/>
+                       <enum name="VAS4SMS Short Message to multiple destinations" code="6"/>
+                       <enum name="VAS4SMS Short Message Virtual Private Network (VPN)" code="7"/>
+                       <enum name="VAS4SMS Short Message Auto Reply" code="8"/>
+                       <enum name="VAS4SMS Short Message Personal Signature" code="9"/>
+                       <enum name="VAS4SMS Short Message Deferred Delivery" code="10"/>
+               </avp>
+               <avp name="MMTel-Information" code="2030" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Service-type"/>
+                               <gavp name="Service-mode"/>
+                               <gavp name="Subscriber-Role"/>
+                               <gavp name="Number-Of-Diversions"/>
+                               <gavp name="Associated-Party-Address"/>
+                       </grouped>
                </avp>
-               <avp name="APN-Configuration-Profile" code="1429" vendor-bit="must" vendor-id="TGPP">
-       <type type-name="Grouped"/>
-                                       <gavp name="Context-Identifier"/>
-                                       <gavp name="All-APN-Configurations-Included-Indicator"/>
-          <gavp name="APN-Configuration"/>
-    </avp>
-               <avp name="APN-Configuration" code="1430" vendor-bit="must" vendor-id="TGPP">
-       <type type-name="Grouped"/>
-                                       <gavp name="Context-Identifier"/> 
-                                       <gavp name="Served-Party-IP-Address"/>
-                                       <gavp name="Served-Party-IP-Address"/>
-                                       <gavp name="PDN-Type"/>
-                                       <gavp name="Service-Selection}
-                                       <gavp name="EPS-Subscribed-QoS Profile"/>
-                                       <gavp name="VPLMN-Dynamic-Address-Allowed"/>
-                                       <gavp name="MIP6-Agent-Info"/>
-                                       <gavp name="PDN-GW-Allocation-Type"/>
-                                       <gavp name="3GPP-Charging-Characteristics"/>
-                                       <gavp name="AMBR"/>
+               <avp name="Service-type" code="2031" vendor-bit="must" vendor-id="TGPP">
+                               <type type-name="Enumerated"/>
                </avp>
-               <avp name="EPS-Subscribed-QoS-Profile" code="1431" vendor-bit="must" vendor-id="TGPP">
-       <type type-name="Grouped"/>
-                                       <gavp name="QoS-Class-Identifier"/>
-                                       <gavp name="ARP"/>
+               <avp name="Service-Mode" code="2032" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
                </avp>
-               <avp name="VPLMN-Dynamic-Address-Allowed" code="1432" vendor-bit="must" vendor-id="TGPP">
-       <type type-name="Enumerated"/>
-      <enum name="NOTALLOWED" code="0"/>
-      <enum name="ALLOWED" code="1"/>
+               <avp name="Subscriber-Role" code="2033" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="ORIGINATING" code="0"/>
+                       <enum name="TERMINATING" code="1"/>
                </avp>
-               <avp name="STN-SR" code="1433" vendor-bit="must" vendor-id="TGPP">
-       <type type-name="OctetString"/>
+               <avp name="Number-Of-Diversions" code="2034" vendor-bit="must" vendor-id="TGPP">
+               <type type-name="Unsigned32"/>
                </avp>
-               <avp name="ARP" code="1434" vendor-bit="must" vendor-id="TGPP">
-       <type type-name="Unsigned32"/>
+               <avp name="Associated-Party-Address" code="2035" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
                </avp>
-               <avp name="AMBR" code="1435" vendor-bit="must" vendor-id="TGPP">
-       <type type-name="Grouped"/>
-                                       <gavp name="Max-Requested-Bandwidth-UL"/>
-                                       <gavp name="Max-Requested-Bandwidth-DL"/>
+               <avp name="SDP-Type" code="2036" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="SDP Offer" code="0"/>
+                       <enum name="SDP Answer" code="1"/>
                </avp>
-  <avp name="PDN-GW-Allocation-Type" code="1438" vendor-bit="must" vendor-id="TGPP">
-       <type type-name="Enumerated"/>
-      <enum name="STATIC" code="0"/>
-      <enum name="DYNAMIC" code="1"/>
+               <avp name="Change-Condition" code="2037" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Integer32"/>
                </avp>
-               <avp name="RAT-Frequency-Selection-Priority-ID" code="1440" vendor-bit="must" vendor-id="TGPP">
-       <type type-name="Unsigned32"/>
+               <avp name="Change-Time" code="2038" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Time"/>
                </avp>
-               <avp name="IDA-Flags" code="1441" vendor-bit="must" vendor-id="TGPP">
-       <type type-name="Unsigned32"/>
+               <avp name="Diagnostics" code="2039" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Time"/>
                </avp>
-               <avp name="PUA-Flags" code="1442" vendor-bit="must" vendor-id="TGPP">
-       <type type-name="Unsigned32"/>
+               <avp name="Service-Data-Container" code="2040" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="AF-Correlation-Information"/>
+                               <gavp name="Charging-Rule-Base-Name"/>
+                               <gavp name="Accounting-Input-Octets"/>
+                               <gavp name="Accounting-Output-Octets"/>
+                               <gavp name="Accounting-Input-Packets"/>
+                               <gavp name="Accounting-Output-Packets"/>
+                               <gavp name="Local-Sequence-Number"/>
+                               <gavp name="QoS-Information"/>
+                               <gavp name="Rating-Group"/>
+                               <gavp name="Change-Time"/>
+                               <gavp name="Service-Identifier"/>
+                               <gavp name="Service-Specific-Info"/>
+                               <gavp name="SGSN-Address"/>
+                               <gavp name="Time-First-Usage"/>
+                               <gavp name="Time-Last-Usage"/>
+                               <gavp name="Time-Usage"/>
+                               <gavp name="Change-Condition"/>
+                               <gavp name="3GPP-User-Location-Info"/>
+                               <gavp name="3GPP2-BSID"/>
+                       </grouped>
                </avp>
-               <avp name="NOR-Flags" code="1443" vendor-bit="must" vendor-id="TGPP">
-       <type type-name="Unsigned32"/>
+               <avp name="Start-Time" code="2041" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Time"/>
                </avp>
-               <avp name="User-Id" code="1444" vendor-bit="must" vendor-id="TGPP">
-       <type type-name="OctetString"/>
+               <avp name="Stop-Time" code="2042" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Time"/>
                </avp>
-               <avp name="Equipment-Status" code="1445" vendor-bit="must" vendor-id="TGPP">
-       <type type-name="Enumerated"/>
-      <enum name="WHITELISTED" code="0"/>
-      <enum name="BLACKLISTED" code="1"/>
-      <enum name="GREYLISTED" code="2"/>
+               <avp name="Time-First-Usage" code="2043" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Time"/>
                </avp>
-               <avp name="Regional-Subscription-Zone-Code" code="1446" vendor-bit="must" vendor-id="TGPP">
-       <type type-name="OctetString"/>
+               <avp name="Time-Last-Usage" code="2044" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Time"/>
                </avp>
-               <avp name="RAND" code="1447" vendor-bit="must" vendor-id="TGPP">
-       <type type-name="OctetString"/>
+               <avp name="Time-Usage" code="2045" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Unsigned32"/>
                </avp>
-               <avp name="XRES" code="1448" vendor-bit="must" vendor-id="TGPP">
-       <type type-name="OctetString"/>
+               <avp name="Traffic-Data-Volumes" code="2046" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="QoS-Information"/>
+                               <gavp name="Accounting-Input-Octets"/>
+                               <gavp name="Accounting-Input-Packets"/>
+                               <gavp name="Accounting-Output-Octets"/>
+                               <gavp name="Accounting-Output-Packets"/>
+                               <gavp name="Change-condition"/>
+                               <gavp name="Change-Time"/>
+                               <gavp name="3GPP-User-Location-Info"/>
+                       </grouped>
                </avp>
-               <avp name="AUTN" code="1449" vendor-bit="must" vendor-id="TGPP">
-       <type type-name="OctetString"/>
+               <avp name="Serving-Node-Type" code="2047" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="SGSN" code="0"/>
+                       <enum name="PMIPSGW" code="1"/>
+                       <enum name="GTPSGW" code="2"/>
+                       <enum name="ePDG" code="3"/>
+                       <enum name="hSGW" code="4"/>
+                       <enum name="MME" code="5"/>
+               </avp>
+               <avp name="Supplementary-Service" code="2048" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Service-Type"/>
+                               <gavp name="Service-Mode"/>
+                               <gavp name="Number-Of-Diversions"/>
+                               <gavp name="Associated-Party-Address"/>
+                               <gavp name="Service-ID"/>
+                               <gavp name="Change-Time"/>
+                               <gavp name="Number-Of-Participants"/>
+                               <gavp name="Participant-Action-Type"/>
+                       </grouped>
                </avp>
-               <avp name="KASME" code="1450" vendor-bit="must" vendor-id="TGPP">
-       <type type-name="OctetString"/>
+               <avp name="Participant-Action-Type" code="2049" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="CREATE_CONF" code="0"/>
+                       <enum name="JOIN_CONF" code="1"/>
+                       <enum name="INVITE_INTO_CONF" code="2"/>
+                       <enum name="QUIT_CONF" code="3"/>
                </avp>
-               <avp name="CK" code="1451" vendor-bit="must" vendor-id="TGPP">
-       <type type-name="OctetString"/>
+               <avp name="PDN-Connection-ID" code="2050" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Unsigned32"/>
                </avp>
-               <avp name="IK" code="1452" vendor-bit="must" vendor-id="TGPP">
-       <type type-name="OctetString"/>
+               <avp name="Dynamic-Address-Flag" code="2051" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="Static" code="0"/>
+                       <enum name="Dynamic" code="1"/>
                </avp>
-               <avp name="Kc" code="1453" vendor-bit="must" vendor-id="TGPP">
-       <type type-name="OctetString"/>
+               <avp name="Accumulated-Cost" code="2052" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Value-Digits"/>
+                               <gavp name="Exponent"/>
+                       </grouped>
                </avp>
-               <avp name="SRES" code="1454" vendor-bit="must" vendor-id="TGPP">
-       <type type-name="OctetString"/>
+               <avp name="AoC-Cost-Information" code="2053" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Accumulated-Cost"/>
+                               <gavp name="Incremental-Cost"/>
+                               <gavp name="Currency-Code"/>
+                       </grouped>
                </avp>
-               <avp name="Requesting-Node-Type" code="1455" vendor-bit="must" vendor-id="TGPP">
-       <type type-name="Enumerated"/>
-      <enum name="MME" code="0"/>
-      <enum name="SGSN" code="1"/>
-      <enum name="MME/SGSN" code="2"/>
+               <avp name="AoC-Information" code="2054" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="AoC-Cost-Information"/>
+                               <gavp name="Incremental-Cost"/>
+                               <gavp name="Tariff-Information"/>
+                       </grouped>
                </avp>
-               <avp name="PDN-Type" code="1456" vendor-bit="must" vendor-id="TGPP">
-       <type type-name="Enumerated"/>
-      <enum name="IPv4" code="0"/>
-      <enum name="IPv6" code="1"/>
-      <enum name="IPv4v6" code="2"/>
+               <avp name="AoC-Request-Type" code="2055" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="AoC_NOT_REQUESTED" code="0"/>
+                       <enum name="AoC_FULL" code="1"/>
+                       <enum name="AoC_COST_ONLY" code="2"/>
+                       <enum name="AoC_TARIFF_ONLY" code="3"/>
                </avp>
-               <avp name="Service-Selection" code="1457" vendor-bit="must" vendor-id="TGPP">
-       <type type-name="UTF8String"/>
+               <avp name="Current-Tariff" code="2056" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Value-Digits"/>
+                               <gavp name="Exponent"/>
+                       </grouped>
                </avp>
-               <avp name="Trace-Data" code="1458" vendor-bit="must" vendor-id="TGPP">  
-      <type type-name="Grouped"/>
-      <gavp name="Trace-Reference"/>
-      <gavp name="Trace-Depth-List"/>
-      <gavp name="Trace-NE-Type-List"/>
-      <gavp name="Trace-Interface-List"/>
-      <gavp name="Trace-Event-List"/>
-      <gavp name="OMC-Id"/>
-    </avp>
-               <avp name="Trace-Reference" code="1459" vendor-bit="must" vendor-id="TGPP">
-      <type type-name="OctetString"/>  
+               <avp name="Next-Tariff" code="2057" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Currency-Code"/>
+                               <gavp name="Scale-Factor"/>
+                               <gavp name="Rate-Element"/>
+                       </grouped>
                </avp>
-               <avp name="Trace-Depth-List" code="1460" vendor-bit="must" vendor-id="TGPP">
-      <type type-name="Grouped"/>
-      <gavp name="Network-Element-Type"/>
-      <gavp name="Trace-Depth"/>
-    </avp>
-               <avp name="Network-Element-Type" code="1461" vendor-bit="must" vendor-id="TGPP">
-      <type type-name="Enumerated"/>
-      <enum name="MME" code="0"/>
-      <enum name="SGSN" code="1"/>
-      <enum name="Serving GW" code="2"/>
-      <enum name="PDN GW" code="3"/>
-      <enum name="eNodeB" code="4"/>
-      <enum name="RNC" code="5"/>
-    </avp>
-               <avp name="Trace-Depth" code="1462" vendor-bit="must" vendor-id="TGPP">
-      <type type-name="Enumerated"/>
-      <enum name="Minimum" code="0"/>
-      <enum name="Medium" code="1"/>
-      <enum name="Maximum" code="2"/>
-      <enum name="MinimumWithoutVendorSpecificExtension" code="3"/>
-      <enum name="MediumWithoutVendorSpecificExtension" code="4"/>
-      <enum name="MaximumWithoutVendorSpecificExtension" code="5"/>
-      <!--
-        The Trace-Depth AVP is of type Enumerated. 
-        The possible values are those defined in 3GPP TS 32.422 [23] for Trace Depth.
-      -->
-    </avp>
-               <avp name="Trace-NE-Type-List" code="1463" vendor-bit="must" vendor-id="TGPP">
-      <type type-name="OctetString"/>
+               <avp name="Rate-Element" code="2058" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="CC-Unit-Type"/>
+                               <gavp name="Unit-Value"/>
+                               <gavp name="Unit-Cost"/>
+                               <gavp name="Unit-Threshold"/>
+                       </grouped>
                </avp>
-               <avp name="Trace-Interface-List" code="1464" vendor-bit="must" vendor-id="TGPP">
-     <type type-name="OctetString"/>
+               <avp name="Scale-Factor" code="2059" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Value-Digits"/>
+                               <gavp name="Exponent"/>
+                       </grouped>
                </avp>
-               <avp name="Trace-Event-List" code="1465" vendor-bit="must" vendor-id="TGPP">
-      <type type-name="OctetString"/>
+               <avp name="Tariff-Information" code="2060" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Current-Tariff"/>
+                               <gavp name="Tariff-Time-Change"/>
+                               <gavp name="Next-Tariff"/>
+                       </grouped>
                </avp>
-               <avp name="OMC-Id" code="1466" vendor-bit="must" vendor-id="TGPP">
-      <type type-name="OctetString"/>
+               <avp name="Unit-Cost" code="2061" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Value-Digits"/>
+                               <gavp name="Exponent"/>
+                       </grouped>
                </avp>
-               <avp name="GPRS-Subscription-Data" code="1467" vendor-bit="must" vendor-id="TGPP">
-      <type type-name="Grouped"/>
-      <gavp name="Complete-Data-List-Included-Indicator"/>
-      <gavp name="PDP-Context"/>
-    </avp>
-               <avp name="Complete-Data-List-Included-Indicator" code="1468" vendor-bit="must" vendor-id="TGPP">
-      <type type-name="Enumerated"/>
-      <enum name="ALL_PDP_CONTEXTS_INCLUDED " code="0"/>
-      <enum name="MODIFIED/ADDED_PDP CONTEXTS_INCLUDED" code="1"/>
-    </avp>
-               <avp name="PDP-Context" code="1469" vendor-bit="must" vendor-id="TGPP">
-      <type type-name="Grouped"/>
-      <gavp name="Context-Identifier"/>
-      <gavp name="PDP-Type"/>
-      <gavp name="PDP-Address"/>
-      <gavp name="QoS-Subscribed"/>
-      <gavp name="VPLMN-Dynamic-Address-Allowed"/>
-      <gavp name="Service-Selection"/>
-      <gavp name="3GPP-Charging-Characteristics"/>
-    </avp>
-               <avp name="PDP-Type" code="1470" vendor-bit="must" vendor-id="TGPP">
-     <type type-name="OctetString"/>   
+               <avp name="Incremental-Cost" code="2062" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Value-Digits"/>
+                               <gavp name="Exponent"/>
+                       </grouped>
                </avp>
-               <avp name="PDP-Address" code="1471" vendor-bit="must" vendor-id="TGPP"> 
-      <type type-name="OctetString"/>
+               <avp name="Local-Sequence-Number" code="2063" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Unsigned32"/>
                </avp>
-    <!--    
-1473 LCS-Info Grouped
-1474 GMLC-Address OctetString
-1475 LCS-PrivacyException Grouped
-1476 SS-Code OctetString
-1477 SS-Status Grouped
-1478 Notification-To-UE-User Enumerated
-1479 External-Client Grouped
-1480 Client-Identity OctetString
-1481 GMLC-Restriction Enumerated
-1482 PLMN-Client Enumerated
-1483 Service-Type Grouped
-1484 ServiceTypeIdentity Unsigned32    
-Note: The AVP codes from 1485 to 1499 are reserved for TS 29.272.
-1500   Non-3GPP-User-Data      Grouped 29.273 [20]
-1501   Non-3GPP-IP-Access      Enumerated      
-1502   Non-3GPP-IP-Access-APN  Enumerated      
-1503   SGW-Address     Address 
-1504   ANID    UTF8String      
-Note: The AVP codes from 1505 to 1599 are reserved for TS 29.273
--->
-               <avp name="SMS-Information" code="2000" vendor-bit="must" vendor-id="TGPP"> 
-     <grouped>
-      <gavp name="SMS-Node"/>
-      <gavp name="Client-Address"/>
-      <gavp name="Originator-SCCP-Address"/>
-      <gavp name="Recipient-SCCP-Address"/>
-      <gavp name="SMSC-Address"/>
-      <gavp name="Data-Coding-Scheme"/>
-      <gavp name="Destination-Interface"/>
-      <gavp name="SM-Discharge-Time"/>
-      <gavp name="SM-Message-Type"/>
-      <gavp name="Originator-Interface"/>
-      <gavp name="SM-Protocol-ID"/>
-      <gavp name="Reply-Path-Requested"/>
-      <gavp name="SM-Status"/>
-      <gavp name="SM-User-Data-Header"/>
-      <gavp name="Number-Of-Messages-Sent"/>
-      <gavp name="Recipients"/>
-     </grouped>
-               </avp>
-               <avp name="Data-Coding-Scheme" code="2001" vendor-bit="must" vendor-id="TGPP"> 
-      <type type-name="Integer32"/>
-               </avp>
-               <avp name="Destination-Interface" code="2002" vendor-bit="must" vendor-id="TGPP"> 
-     <grouped>
-      <gavp name="Interface-Id"/>
-      <gavp name="Interface-Text"/>
-      <gavp name="Interface-Port"/>
-      <gavp name="Interface-Type"/>
-     </grouped>
-               </avp>
-               <avp name="Interface-Id" code="2003" vendor-bit="must" vendor-id="TGPP"> 
-      <type type-name="UTF8String"/>
+               <avp name="Node-Id" code="2064" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
                </avp>
-               <avp name="Interface-Port" code="2004" vendor-bit="must" vendor-id="TGPP"> 
-      <type type-name="UTF8String"/>
+               <avp name="SGW-Change" code="2065" mandatory="must" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="ARC_Start_NOT_due_to_SGW_Change" code="0"/>
+                       <enum name="ARC_Start_due_to_SGW_Change" code="1"/>
                </avp>
-               <avp name="Interface-Text" code="2005" vendor-bit="must" vendor-id="TGPP"> 
-      <type type-name="UTF8String"/>
+               <avp name="Charging-Characteristic-Selection-Mode" code="2066" mandatory="must" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="Serving-Node-Supplied" code="0"/>
+                       <enum name="Subscription-specific" code="1"/>
+                       <enum name="APN-specific" code="2"/>
+                       <enum name="Home-Default" code="3"/>
+                       <enum name="Roaming-Default" code="4"/>
+                       <enum name="Visiting-Default" code="5"/>
                </avp>
-               <avp name="Interface-Type" code="2006" vendor-bit="must" vendor-id="TGPP">
-      <type type-name="Enumerated"/>
-      <enum name="Unknown" code="0"/>
-      <enum name="MOBILE_ORIGINATING" code="1"/>
-      <enum name="MOBILE_TERMINATING" code="2"/>
-      <enum name="APPLICATION_ORIGINATING" code="3"/>
-      <enum name="APPLICATION_TERMINATION" code="4"/>
-    </avp>
-               <avp name="SM-Message-Type" code="2007" vendor-bit="must" vendor-id="TGPP">
-      <type type-name="Enumerated"/>
-      <enum name="SUBMISSION" code="0"/>
-      <enum name="DELIVERY_REPORT" code="1"/>
-      <enum name="SM Service Request" code="1"/>
-    </avp>
-               <avp name="Originating-SCCP-Address" code="2008" vendor-bit="must" vendor-id="TGPP"> 
-      <type type-name="Address"/>
-               </avp>
-               <avp name="Destination-Interface" code="2009" vendor-bit="must" vendor-id="TGPP"> 
-     <grouped>
-      <gavp name="Interface-Id"/>
-      <gavp name="Interface-Text"/>
-      <gavp name="Interface-Port"/>
-      <gavp name="Interface-Type"/>
-     </grouped>
-               <avp name="Recipient-SCCP-Address" code="2010" vendor-bit="must" vendor-id="TGPP"> 
-      <type type-name="Address"/>
+
+<!-- Note: The AVP codes from 2067 to 2099 are reserved for TS 32.299 -->
+               <avp name="Reserved" code="2100" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
                </avp>
-               <avp name="Reply-Path-Requested" code="2011" vendor-bit="must" vendor-id="TGPP">
-      <type type-name="Enumerated"/>
-      <enum name="No Reply Path Set" code="0"/>
-      <enum name="Reply path Set" code="1"/>
-    </avp>
-               <avp name="SM-Discharge-Time" code="2012" vendor-bit="must" vendor-id="TGPP"> 
-      <type type-name="Time"/>
+               <avp name="Application-Server-ID" code="2101" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Unsigned32"/>
                </avp>
-               <avp name="SM-Protocol-ID" code="2013" vendor-bit="must" vendor-id="TGPP"> 
-      <type type-name="OctetString"/>
+               <avp name="Application-Service-Type" code="2102" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="SENDING" code="100"/>
+                       <enum name="RECEIVING" code="101"/>
+                       <enum name="RETRIEVAL" code="102"/>
+                       <enum name="INVITING" code="103"/>
+                       <enum name="LEAVING" code="104"/>
+                       <enum name="JOINING" code="105"/>
+               </avp>
+               <avp name="Application-Session-ID" code="2103" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Unsigned32"/>
                </avp>
-               <avp name="SM-Status" code="2014" vendor-bit="must" vendor-id="TGPP"> 
-      <type type-name="OctetString"/>
+               <avp name="Delivery-Status" code="2104" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
                </avp>
-               <avp name="SM-User-Data-Header" code="2015" vendor-bit="must" vendor-id="TGPP"> 
-      <type type-name="OctetString"/>
+               <avp name="Reserved" code="2105" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
                </avp>
-               <avp name="SMS-Node" code="2016" vendor-bit="must" vendor-id="TGPP">
-      <type type-name="Enumerated"/>
-      <enum name="SMS Router" code="0"/>
-      <enum name="IP-SM-GW" code="1"/>
-      <enum name="SMS Router and IP-SM-GW" code="2"/>
-      <enum name="SMS-SC" code="4"/>
-    </avp>
-               <avp name="SMSC-Address" code="2017" vendor-bit="must" vendor-id="TGPP"> 
-      <type type-name="Address"/>
+               <avp name="Reserved" code="2106" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
                </avp>
-               <avp name="Client-Address" code="2018" vendor-bit="must" vendor-id="TGPP"> 
-      <type type-name="Address"/>
+               <avp name="Reserved" code="2107" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
                </avp>
-               <avp name="Number-of-Messages-Sent" code="2019" vendor-bit="must" vendor-id="TGPP"> 
-      <type type-name="Unsigned32"/>
+               <avp name="Reserved" code="2108" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
                </avp>
-               <avp name="Low-Balance-Indication" code="2020" vendor-bit="must" vendor-id="TGPP">
-      <type type-name="Enumerated"/>
-      <enum name="NOT-APPLICABLE" code="0"/>
-      <enum name="YES" code="1"/>
-    </avp>
-               <avp name="Remaining-Balance" code="2021" vendor-bit="must" vendor-id="TGPP"> 
-     <grouped>
-      <gavp name="Unit-Value"/>
-      <gavp name="Currency-Code"/>
-     </grouped>
-               <avp name="Refund-Information" code="2022" vendor-bit="must" vendor-id="TGPP"> 
-      <type type-name="OctetString"/>
+               <avp name="Reserved" code="2109" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
                </avp>
-
-               <avp name="Carrier-Select-Routing-Information" code="2023" vendor-bit="must" vendor-id="TGPP"> 
-      <type type-name="UTF8String"/>
+               <avp name="IM-Information" code="2110" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Interface-Id"/>
+                               <gavp name="Interface-Text"/>
+                               <gavp name="Interface-Port"/>
+                               <gavp name="Interface-Type"/>
+                       </grouped>
                </avp>
-               <avp name="Number-Portability-Routing-Information" code="2024" vendor-bit="must" vendor-id="TGPP"> 
-      <type type-name="UTF8String"/>
+               <avp name="Number-Of-Messages-Successfully-Exploded" code="2111" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Unsigned32"/>
                </avp>
-               <avp name="PoC-Event-Type" code="2025" vendor-bit="must" vendor-id="TGPP">
-      <type type-name="Enumerated"/>
-      <enum name="Normal" code="0"/>
-      <enum name="Instant Personal Aalert event" code="1"/>
-      <enum name="PoC Group Advertisement event" code="2"/>
-      <enum name="Early Ssession Setting-up event" code="3"/>
-      <enum name="PoC Talk Burst" code="4"/>
-    </avp>    
-               <avp name="Recipients" code="2026" vendor-bit="must" vendor-id="TGPP"> 
-     <grouped>
-      <gavp name="Recipient-Address"/>
-     </grouped>
-               <avp name="Destination-Interface" code="2027" vendor-bit="must" vendor-id="TGPP"> 
-     <grouped>
-      <gavp name="Address-Type"/>
-      <gavp name="Address-Data"/>
-      <gavp name="Address-Domain"/>
-     </grouped>
-               <avp name="Recipient-Received-Address" code="2028" vendor-bit="must" vendor-id="TGPP"> 
-     <grouped>
-      <gavp name="Address-Type"/>
-      <gavp name="Address-Data"/>
-      <gavp name="Address-Domain"/>
-     </grouped>
-               <avp name="SM-Service-Type" code="2029" vendor-bit="must" vendor-id="TGPP">
-      <type type-name="Enumerated"/>
-      <enum name="VAS4SMS Short Message content processing" code="0"/>
-      <enum name="VAS4SMS Short Message forwarding" code="1"/>
-      <enum name="VAS4SMS Short Message Forwarding multiple subscriptions" code="2"/>
-      <enum name="VAS4SMS Short Message filtering" code="3"/>
-      <enum name="VAS4SMS Short Message receipt" code="4"/>
-      <enum name="VAS4SMS Short Message Network Storage" code="5"/>
-      <enum name="VAS4SMS Short Message to multiple destinations" code="6"/>
-      <enum name="VAS4SMS Short Message Virtual Private Network (VPN)" code="7"/>
-      <enum name="VAS4SMS Short Message Auto Reply" code="8"/>
-      <enum name="VAS4SMS Short Message Personal Signature" code="9"/>
-      <enum name="VAS4SMS Short Message Deferred Delivery" code="10"/>
-    </avp>    
-               <avp name="MMTel-Information" code="2030" vendor-bit="must" vendor-id="TGPP"> 
-     <grouped>
-      <gavp name="Service-type"/>
-      <gavp name="Service-mode"/>
-      <gavp name="Subscriber-Role"/>
-      <gavp name="Number-Of-Diversions"/>
-      <gavp name="Associated-Party-Address"/>
-     </grouped>
-               <avp name="Service-type" code="2031" vendor-bit="must" vendor-id="TGPP"> 
-       <type type-name="Enumerated"/>
-               </avp>
-               <avp name="Service-Mode" code="2032" vendor-bit="must" vendor-id="TGPP"> 
-       <type type-name="Enumerated"/>
+               <avp name="Number-Of-Messages-Successfully-Sent" code="2112" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Unsigned32"/>
                </avp>
-               <avp name="Subscriber-Role" code="2033" vendor-bit="must" vendor-id="TGPP">
-      <type type-name="Enumerated"/>
-      <enum name="ORIGINATING" code="0"/>
-      <enum name="TERMINATING" code="1"/>
-    </avp>    
-               <avp name="Number-Of-Diversions" code="2034" vendor-bit="must" vendor-id="TGPP"> 
-      <type type-name="Unsigned32"/>
+               <avp name="Total-Number-Of-Messages-Exploded" code="2113" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Unsigned32"/>
                </avp>
-               <avp name="Associated-Party-Address" code="2035" vendor-bit="must" vendor-id="TGPP"> 
-      <type type-name="UTF8String"/>
+               <avp name="Total-Number-Of-Messages-Sen" code="2114" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Unsigned32"/>
                </avp>
-               <avp name="SDP-Type" code="2036" vendor-bit="must" vendor-id="TGPP"> 
-       <type type-name="Enumerated"/>
-      <enum name="SDP Offer" code="0"/>
-      <enum name="SDP Answer" code="1"/>
-               </avp>
- <!--  
-Change-Condition 2037 X - - - Enumerated V,M P N
-Change-Time 2038 X - - - Time V,M P N
-               <avp name="Non-3GPP-Access-Information" code="2050" vendor-bit="must" vendor-id="TGPP"> 
-     <grouped>
-      </grouped>
-    </avp>
-Service-Condition-Change 2039 X - - - Enumerated V,M P N
-Service-Data-Container 2040 X - - - Grouped V,M P N
-Start-Time 2041 X - - - Time V,M P N
-Stop-Time 2042 X - - - Time V,M P N
-Time-First-Usage 2043 X - - - Time V,M P N
-Time-Last-Usage 2044 X - - - Time V,M P N
-Time-Usage 2045 X - - - Unsigned32 V,M P N
-Traffic-Data-Volumes 2046 X - - - Grouped V,M P N
-Non-3GPP-Access-Information 2050 X - X - Grouped V,M P N
-
-Note: The AVP codes from 2023 to 2099 are reserved for TS 32.299
-2100   reserved        -       32.299 [5]
-2101   Application-Server-ID   UTF8String      
-2102   Application-Service-Type        Enumerated      
-2103   Application-Session-ID  Unsigned32      
-2104   Delivery-Status UTF8String      
-2105   reserved        -       
-2106   reserved        -       
-2107   reserved        -       
-2108   reserved        -       
-2109   reserved        -       
-               <avp name="IM-Information" code="2110" vendor-bit="must" vendor-id="TGPP"> 
-     <grouped>
-      <gavp name="Interface-Id"/>
-      <gavp name="Interface-Text"/>
-      <gavp name="Interface-Port"/>
-      <gavp name="Interface-Type"/>
-      </grouped>
-    </avp>
-
-2111   Number-Of-Messages-Successfully-Exploded        Unsigned32      
-2112   Number-Of-Messages-Successfully-Sent    Unsigned32      
-2113   Total-Number-Of-Messages-Exploded       Unsigned32      
-2114   Total-Number-Of-Messages-Sent   Unsigned32      
-               <avp name="MMTel-Information" code="2026" vendor-bit="must" vendor-id="TGPP"> 
-     <grouped>
-      <gavp name="Service-type"/>
-      <gavp name="Service-mode"/>
-      <gavp name="Subscriber-Role"/>
-      <gavp name="Number-Of-Diversions"/>
-      <gavp name="Associated-Party-Address"/>
-     </grouped>
-               </avp>
-
-Note: The AVP codes from 2115 to 2199 are reserved for TS 32.299
+<!--
+2115 DCD-Information Grouped
+2116 Content-ID UTF8String
+2117 Content-provider-ID UTF8String
+32.299 [5]
+Note: The AVP codes from 2118 to 2199 are reserved for TS 32.299
 2200 Subsession-Decision-Info Grouped
 2201 Subsession-Enforcement-Info Grouped
 2202 Subsession-Id Unsigned32
 2203 Subsession-Operation Enumerated
+2204 Multiple-BBERF-Action Enumerated
 29.215 [22]
 Note: The AVP codes from 2204 to 2299 are reserved for TS 29.215
+-->
+               <avp name="Reserved" code="2300" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="SIP-Request-Timestamp-Fraction" code="2301" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Unsigned32"/>
+               </avp>
+               <avp name="SIP-Response-Timestamp-Fraction" code="2302" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Unsigned32"/>
+               </avp>
+               <avp name="Online-Charging-Flag" code="2303" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="ECF address not provided" code="0"/>
+                       <enum name="ECF address provided" code="1"/>
+               </avp>
+               <avp name="CUG-Information" code="2304" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="OctetString"/>
+               </avp>
+               <avp name="Real-Time-Tariff-Information" code="2305" vendor-bit="must" vendor-id="TGPP">
+                       <grouped>
+                               <gavp name="Tariff-Information"/>
+                               <gavp name="Tariff-XML"/>
+                       </grouped>
+               </avp>
+               <avp name="Tariff-XML" code="2306" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
+               </avp>
+               <avp name="MBMS-GW-Address" code="2307" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="IPAddress"/>
+               </avp>
+               <avp name="IMSI-Unauthenticated-Flag" code="2308" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Enumerated"/>
+                       <enum name="Authenticated" code="0"/>
+                       <enum name="Unauthenticated" code="1"/>
+               </avp>
+<!--
+2309   Account-Expiration      Time
+2310   AoC-Format      Enumerated
+2311   AoC-Service     Enumerated
+2312   AoC-Service-Obligatory-Type     Grouped
+2313   AoC-Service-Type        Enumerated
+2314   AoC-Subscription-Information    Grouped
+2315   Preferred-AoC-Currency  Unsigned32
+2316   Reason-Code     Enumerated
+2317   CSG-Access-Mode Enumerated
+2318   CSG-Membership-Indication       Enumerated
+2319   User-CSG-Information    Grouped
+
+Note: The AVP codes from 2320 to 2399 are reserved for TS 32.299
+2400   LMSI    OctetString
+2401   Serving-Node    Grouped
+2402   MME-Name        DiameterIdentity
+2403   MSC-Number      OctetString
+2404   LCS-Capabilities-Sets   Unsigned32
+2405   GMLC-Address    Address
+2406   Additional-Serving-Node Grouped
+2407   PPR-Address     Address
+Note: The AVP codes from 2408 to 2499 are reserved for TS 29.173
+-->
+      <avp name="Location-Type" code="2500" vendor-bit="must" vendor-id="TGPP">
+        <type type-name="Enumerated"/>
+        <enum name="CURRENT_LOCATION" code="0"/>
+        <enum name="CURRENT_OR_LAST_KNOWN_LOCATION" code="1"/>
+        <enum name="INITIAL_LOCATION " code="2"/>
+        <enum name="RESERVED" code="3"/>
+        <enum name="RESERVED" code="4"/>
+        <enum name="NOTIFICATION_VERIFICATION_ONLY" code="5"/>
+      </avp>
+
+      <avp name="LCS-EPS-Client-Name" code="2501" vendor-bit="must" vendor-id="TGPP">
+        <grouped>
+          <gavp name="LCS-Name-String"/>
+          <gavp name="LCS-Format-Indicator"/>
+        </grouped>
+      </avp>
+
+      <avp name="LCS-Requestor-Name" code="2502" vendor-bit="must" vendor-id="TGPP">
+        <grouped>
+          <gavp name="LCS-Requestor-Id-String"/>
+          <gavp name="LCS-Format-Indicator"/>
+        </grouped>
+      </avp>
+
+      <avp name="LCS-Priority" code="2503" vendor-bit="must" vendor-id="TGPP">
+        <type type-name="Unsigned32"/>
+      </avp>
+
+      <avp name="LCS-QoS" code="2504" vendor-bit="must" vendor-id="TGPP">
+        <grouped>
+          <gavp name="LCS-QoS-Class"/>
+          <gavp name="Vertical-Accuracy "/>
+          <gavp name="Vertical-Requested"/>
+          <gavp name="Response-Time"/>
+        </grouped>
+      </avp>
+
+      <!--      
+2505   Horizontal-Accuracy     Unsigned32
+2506   Vertical-Accuracy       Unsigned32
+2507   Vertical-Requested      Enumerated
+-->
+      <avp name="Velocity-Requested" code="2508" vendor-bit="must" vendor-id="TGPP">
+        <type type-name="Enumerated"/>
+        <enum name="VELOCITY_IS_NOT_REQUESTED" code="0"/>
+        <enum name="BEST VELOCITY_IS_REQUESTED" code="1"/>
+      </avp>
+
+      <!--
+2509   Response-Time   Enumerated
+-->
+      <avp name="Supported-GAD-Shapes" code="2510" vendor-bit="must" vendor-id="TGPP">
+        <type type-name="Unsigned32"/>
+      </avp>
+
+      <avp name="LCS-Codeword" code="2511" vendor-bit="must" vendor-id="TGPP"> 
+        <type type-name="UTF8String"/>
+      </avp>
+
+      <avp name="LCS-Privacy-Check" code="2512" vendor-bit="must" vendor-id="TGPP">
+        <type type-name="Enumerated"/>
+        <enum name="ALLOWED_WITHOUT_NOTIFICATION" code="0"/>
+        <enum name="ALLOWED_WITH_NOTIFICATION" code="1"/>
+        <enum name="ALLOWED_IF_NO_RESPONSE" code="2"/>
+        <enum name="RESTRICTED_IF_NO_RESPONSE" code="3"/>
+        <enum name="NOT_ALLOWED" code="4"/>
+      </avp>
+
+      <!--
+2513   Accuracy-Fulfilment-Indicator   Enumerated
+-->
+      <avp name="Age-Of-Location-Estimate" code="2514" vendor-bit="must" vendor-id="TGPP">
+        <type type-name="Unsigned32"/>
+      </avp>
+
+      <!--
+2515   Velocity-Estimate       OctetString
+2516   EUTRAN-Positioning-Data OctetString
+-->
+      <avp name="ECGI" code="2517" vendor-bit="must" vendor-id="TGPP">
+        <type type-name="OctetString"/>
+      </avp>
+      <!--
+2518   Location-Event  Enumerated
+2519   Pseudonym-Indicator     Enumerated
+-->
+      <avp name="LCS-Service-Type-ID" code="2520" vendor-bit="must" vendor-id="TGPP">
+        <type type-name="Unsigned32"/>
+      </avp>
+
+      <avp name="LCS-Privacy-Check-Non-Session" code="2521" vendor-bit="must" vendor-id="TGPP">
+        <grouped>
+          <gavp name="LCS-Privacy-Check"/>
+        </grouped>
+      </avp>
+
+      <avp name="LCS-Privacy-Check-Session" code="2522" vendor-bit="must" vendor-id="TGPP">
+        <grouped>
+          <gavp name="LCS-Privacy-Check"/>
+        </grouped>
+      </avp>
+
+      <avp name="LCS-QoS-Class" code="2523" vendor-bit="must" vendor-id="TGPP">
+        <type type-name="Enumerated"/>
+        <enum name="ASSURED" code="0"/>
+        <enum name="BEST EFFORT" code="1"/>
+      </avp>
+
+      <!--
+Note: The AVP codes from 2524 to 2599 are reserved for TS 29.172
 
 -->
-<!--- 3GPP2 AVP's X.S0013-014-0 
-http://www.3gcn.org/3gpp2/TSGX/Projects/X.P0013-B%20IP%20Network%20-%20MMD/X.S0013-014%20v0.3.0%20SBBC%20Ty%20Stage-3.doc
+<!--- TGPP2 AVP's X.S0013-014-0
+http://www.3gcn.org/TGPP2/TSGX/Projects/X.P0013-B%20IP%20Network%20-%20MMD/X.S0013-014%20v0.3.0%20SBBC%20Ty%20Stage-3.doc
 -->
-               <avp name="Bearer-Usage" code="1000" vendor-bit="must" vendor-id="3GPP2">
+               <avp name="Bearer-Usage" code="1000" vendor-bit="must" vendor-id="TGPP2">
                        <type type-name="Enumerated"/>
                        <enum name="GENERAL" code="0"/>
                        <enum name="IMS_SIGNALLING" code="1"/>
                </avp>
-               <avp name="Charging-Rule-Install" code="1001" vendor-bit="must" vendor-id="3GPP2">
+               <avp name="Charging-Rule-Install" code="1001" vendor-bit="must" vendor-id="TGPP2">
                        <grouped>
                                <gavp name="Charging-Rule-Definition"/>
                                <gavp name="Charging-Rule-Name"/>
                                <gavp name="Charging-Rule-Base-Name"/>
                        </grouped>
                </avp>
-               <avp name="Charging-Rule-Remove" code="1002" vendor-bit="must" vendor-id="3GPP2">
+               <avp name="Charging-Rule-Remove" code="1002" vendor-bit="must" vendor-id="TGPP2">
                        <grouped>
                                <gavp name="Charging-Rule-Name"/>
                                <gavp name="Charging-Rule-Base-Name"/>
                        </grouped>
                </avp>
-               <avp name="Charging-Rule-Definition" code="1003" vendor-bit="must" vendor-id="3GPP2">
+               <avp name="Charging-Rule-Definition" code="1003" vendor-bit="must" vendor-id="TGPP2">
                        <grouped>
                                <gavp name="Charging-Rule-Name"/>
                                <gavp name="Service-Identifier"/>
                                <gavp name="Rating-Group"/>
                                <gavp name="Flow-Description"/>
                                <gavp name="Reporting-Level"/>
-                               <gavp name="Online"/>
+                               <gavp name="Online"/>
                                <gavp name="Offline"/>
                                <gavp name="Metering-Method"/>
                                <gavp name="Precedence"/>
@@ -3503,90 +5743,99 @@ http://www.3gcn.org/3gpp2/TSGX/Projects/X.P0013-B%20IP%20Network%20-%20MMD/X.S00
                                <gavp name="Flows"/>
                        </grouped>
                </avp>
-               <avp name="Charging-Rule-Base-Name" code="1004" vendor-bit="must" vendor-id="3GPP2">
+               <avp name="Charging-Rule-Base-Name" code="1004" vendor-bit="must" vendor-id="TGPP2">
                        <type type-name="OctetString"/>
                </avp>
-               <avp name="Charging-Rule-Name" code="1005" vendor-bit="must" vendor-id="3GPP2">
+               <avp name="Charging-Rule-Name" code="1005" vendor-bit="must" vendor-id="TGPP2">
                        <type type-name="OctetString"/>
                </avp>
-               <avp name="Event-Trigger" code="1006" vendor-bit="must" vendor-id="3GPP2">
+               <avp name="Event-Trigger" code="1006" vendor-bit="must" vendor-id="TGPP2">
                        <type type-name="Enumerated"/>
                        <enum name="SGSN_CHANGE" code="0"/>
                        <enum name="QOS_CHANGE" code="1"/>
                        <enum name="RAT_CHANGE" code="2"/>
                        <enum name="TFT_CHANGE" code="3"/>
                </avp>
-               <avp name="Metering-Method" code="1007" vendor-bit="must" vendor-id="3GPP2">
+               <avp name="Metering-Method" code="1007" vendor-bit="must" vendor-id="TGPP2">
                        <type type-name="Enumerated"/>
                        <enum name="DURATION" code="0"/>
                        <enum name="VOLUME" code="1"/>
                        <enum name="DURATION_VOLUME" code="2"/>
                </avp>
-               <avp name="Offline" code="1008" vendor-bit="must" vendor-id="3GPP2">
+               <avp name="Offline" code="1008" vendor-bit="must" vendor-id="TGPP2">
                        <type type-name="Enumerated"/>
                        <enum name="DISABLE_OFFLINE" code="0"/>
                        <enum name="ENABLE_OFFLINE" code="1"/>
                </avp>
-               <avp name="Online" code="1009" vendor-bit="must" vendor-id="3GPP2">
+               <avp name="Online" code="1009" vendor-bit="must" vendor-id="TGPP2">
                        <type type-name="Enumerated"/>
                        <enum name="DISABLE_ONLINE" code="0"/>
                        <enum name="ENABLE_ONLINE" code="1"/>
                </avp>
-               <avp name="Precedence" code="1010" vendor-bit="must" vendor-id="3GPP2">
+               <avp name="Precedence" code="1010" vendor-bit="must" vendor-id="TGPP2">
                        <type type-name="Unsigned32"/>
                </avp>
-               <avp name="Primary-CCF-Address" code="1011" vendor-bit="must" vendor-id="3GPP2">
+               <avp name="Primary-CCF-Address" code="1011" vendor-bit="must" vendor-id="TGPP2">
                        <type type-name="DiameterURI"/>
                </avp>
-               <avp name="Primary-OCS-Address" code="1012" vendor-bit="must" vendor-id="3GPP2">
+               <avp name="Primary-OCS-Address" code="1012" vendor-bit="must" vendor-id="TGPP2">
                        <type type-name="DiameterURI"/>
                </avp>
-               <avp name="Reporting-Level" code="1014" vendor-bit="must" vendor-id="3GPP2">
+               <avp name="Reporting-Level" code="1014" vendor-bit="must" vendor-id="TGPP2">
                        <type type-name="Enumerated"/>
                        <enum name="CHARGING_RULE_LEVEL" code="0"/>
                        <enum name="RATING_GROUP_LEVEL" code="1"/>
                </avp>
-               <avp name="Secondary-CCF-Address" code="1015" vendor-bit="must" vendor-id="3GPP2">
+               <avp name="Secondary-CCF-Address" code="1015" vendor-bit="must" vendor-id="TGPP2">
                        <type type-name="DiameterURI"/>
                </avp>
-               <avp name="Secondary-OCS-Address" code="1016" vendor-bit="must" vendor-id="3GPP2">
+               <avp name="Secondary-OCS-Address" code="1016" vendor-bit="must" vendor-id="TGPP2">
                        <type type-name="DiameterURI"/>
                </avp>
-               <avp name="TFT-Filter" code="1017" vendor-bit="must" vendor-id="3GPP2">
+               <avp name="TFT-Filter" code="1017" vendor-bit="must" vendor-id="TGPP2">
                        <type type-name="IPFilterRule"/>
                </avp>
-               <avp name="TFT-Packet-Filter-Information" code="1018" vendor-bit="must" vendor-id="3GPP2">
+               <avp name="TFT-Packet-Filter-Information" code="1018" vendor-bit="must" vendor-id="TGPP2">
                        <grouped>
                                <gavp name="Precedence"/>
                                <gavp name="TFT-Filter"/>
                                <gavp name="ToS-Traffic-Class"/>
                        </grouped>
                </avp>
-               <avp name="ToS-Traffic-Class" code="1019" vendor-bit="must" vendor-id="3GPP2">
+               <avp name="ToS-Traffic-Class" code="1019" vendor-bit="must" vendor-id="TGPP2">
                        <type type-name="OctetString"/>
                </avp>
-
        </base>
        <application id="0" name="Diameter Common Messages" uri="http://www.ietf.org/rfc/rfc3588.txt?number=3588">
        </application>
-
        <application id="3" name="Diameter Base Accounting" uri="http://www.ietf.org/rfc/rfc3588.txt?number=3588">
        </application>
-
        <application id="16777216" name="3GPP Cx" uri="http://www.ietf.org/rfc/rfc3588.txt?number=3588">
        </application>
-  <application id="16777251" name="3GPP S6a/S6d" uri="http://www.ietf.org/rfc/rfc3588.txt?number=3588">
-    <command name="3GPP-Update-Location" code="316" vendor-id="None"/>
-    <command name="3GPP-Cancel-Location" code="317" vendor-id="None"/> <!-- [3GPP TS 29.272][RFC5516] -->
-    <command name="3GPP-Authentication-Information" code="318" vendor-id="None"/> <!-- [3GPP TS 29.272][RFC5516] -->
-    <command name="3GPP-Insert-Subscriber-Data" code="319" vendor-id="None"/> <!--[3GPP TS 29.272][RFC5516] -->
-    <command name="3GPP-Delete-Subscriber-Data" code="320" vendor-id="None"/> <!--[3GPP TS 29.272][RFC5516] -->
-    <command name="3GPP-Purge-UE" code="321" vendor-id="None"/> <!--[3GPP TS 29.272][RFC5516] -->
-    <command name="3GPP-Reset" code="322" vendor-id="None"/> <!--[3GPP TS 29.272][RFC5516] -->
-    <command name="3GPP-Notify" code="323" vendor-id="None"/> <!--[3GPP TS 29.272][RFC5516] -->
-    <command name="3GPP-ME-Identity-Check" code="324" vendor-id="None"/> <!--[3GPP TS 29.272][RFC5516] -->
+       <application id="16777224" name="3GPP Gx" uri="http://www.3gpp.org/ftp/Specs/html-info/29210.htm">
+       </application>
+       <application id="16777232" name="Ericsson Charging-CIP" uri="http://www.3gpp.org/ftp/Specs/html-info/29210.htm">
+       </application>
+       <application id="16777238" name="3GPP Gx" uri="http://www.3gpp.org/ftp/Specs/html-info/29212.htm">
+       </application>
+  <application id="16777250" name="3GPP STa" uri="http://www.3gpp.org/ftp/Specs/html-info/29273.htm">
+  </application>
+  <application id="16777251" name="3GPP S6a/S6d" uri="http://www.ietf.org/rfc/rfc5516.txt?number=5516">
+       </application>
+       <application id="16777252" name="3GPP S13/S13'" uri="http://www.ietf.org/rfc/rfc5516.txt?number=5516">
+       </application>
+  <application id="16777255" name="3GPP SLg" uri="http://www.ietf.org/rfc/rfc3588.txt?number=3588">
+  </application>
+  <application id="16777265" name="3GPP SWx" uri="http://www.3gpp.org/ftp/Specs/html-info/29212.htm">
+       </application>
+       <application id="16777266" name="3GPP Gxx" uri="http://www.3gpp.org/ftp/Specs/html-info/29212.htm">
+       </application>
+  <application id="16777272" name="3GPP S6b" uri="http://www.3gpp.org/ftp/Specs/html-info/29273.htm">
+  </application>
+  <application id="16777304" name="Ericsson Sy" uri="http://www.3gpp.org/ftp/Specs/html-info/29212.htm">
   </application>
   &nasreq;
+       &eap;
        &mobileipv4;
        &chargecontrol;
        &sunping;
@@ -3598,4 +5847,7 @@ http://www.3gcn.org/3gpp2/TSGX/Projects/X.P0013-B%20IP%20Network%20-%20MMD/X.S00
        &gqpolicy;
        &etsie2e4;
        &Ericsson;
+  &mobileipv6;
+  &Cisco;
+  &Vodafone;
 </dictionary>