diff mbox series

[2/5] uqmi: sync data from libqmi project

Message ID 20240410102509.3936469-2-jean.thomas@wifirst.fr
State Accepted
Delegated to: Alexander Couzens
Headers show
Series [1/5] uqmi: support C reserved keywords in upstream JSON files | expand

Commit Message

Jean Thomas April 10, 2024, 10:25 a.m. UTC
JSON files taken from libqmi at commit
20a902ac997b6d140154295e7cdf5d5e986f9b67.

Signed-off-by: Jean Thomas <jean.thomas@wifirst.fr>
---
 data/qmi-service-ctl.json |   88 +++-
 data/qmi-service-dms.json |  376 ++++++++------
 data/qmi-service-nas.json | 1009 +++++++++++++++++++++++++------------
 data/qmi-service-uim.json |  137 +++--
 data/qmi-service-wda.json |   12 +-
 data/qmi-service-wds.json |  341 ++++++++-----
 data/qmi-service-wms.json |   51 +-
 7 files changed, 1335 insertions(+), 679 deletions(-)
diff mbox series

Patch

diff --git a/data/qmi-service-ctl.json b/data/qmi-service-ctl.json
index a964066..4e82597 100644
--- a/data/qmi-service-ctl.json
+++ b/data/qmi-service-ctl.json
@@ -43,21 +43,22 @@ 
      "id"      : "0x0021",
      "since"   : "1.0",
      "output"  : [  { "common-ref" : "Operation Result" },
-                    { "name"      : "Service list",
-                      "id"        : "0x01",
-                      "type"      : "TLV",
-                      "since"     : "1.0",
-                      "format"    : "array",
-                      "array-element" : { "name"     : "Service",
-                                          "format"   : "struct",
-                                          "contents" : [ { "name"          : "Service",
-                                                           "format"        : "guint8",
-                                                           "public-format" : "QmiService" },
-                                                         { "name"   : "Major version",
-                                                           "format" : "guint16" },
-                                                         { "name"   : "Minor version",
-                                                           "format" : "guint16" } ] },
-                      "prerequisites": [ { "common-ref" : "Success" } ] } ] },
+                    { "name"               : "Service list",
+                      "id"                 : "0x01",
+                      "type"               : "TLV",
+                      "since"              : "1.0",
+                      "format"             : "array",
+                      "size-prefix-format" : "guint8",
+                      "array-element"      : { "name"     : "Service",
+                                               "format"   : "struct",
+                                               "contents" : [ { "name"          : "Service",
+                                                                "format"        : "guint8",
+                                                                "public-format" : "QmiService" },
+                                                              { "name"   : "Major version",
+                                                                "format" : "guint16" },
+                                                              { "name"   : "Minor version",
+                                                                "format" : "guint16" } ] },
+                      "prerequisites"      : [ { "common-ref" : "Success" } ] } ] },
 
   // *********************************************************************************
   {  "name"    : "Allocate CID",
@@ -167,6 +168,61 @@ 
                      "type"      : "TLV",
                      "since"     : "1.8",
                      "format"    : "string" } ],
-     "output"  : [ { "common-ref" : "Operation Result" } ] }
+     "output"  : [ { "common-ref" : "Operation Result" } ] },
+
+  // *********************************************************************************
+  // Internal
+  {  "name"    : "Internal Allocate CID QRTR",
+     "type"    : "Message",
+     "service" : "CTL",
+     "id"      : "0xFF22",
+     "since"   : "1.0",
+     "input"   : [  { "name"          : "Service",
+                      "id"            : "0x01",
+                      "type"          : "TLV",
+                      "since"         : "1.0",
+                      "format"        : "guint16" ,
+                      "public-format" : "QmiService" } ],
+     "output"  : [  { "common-ref" : "Operation Result" },
+                    { "name"      : "Allocation Info",
+                      "id"        : "0x01",
+                      "type"      : "TLV",
+                      "since"     : "1.0",
+                      "format"    : "sequence",
+                      "contents"  : [ { "name"          : "Service",
+                                        "format"        : "guint16",
+                                        "public-format" : "QmiService" },
+                                      { "name"   : "Cid",
+                                        "format" : "guint8" } ],
+                      "prerequisites": [ { "common-ref" : "Success" } ] } ] },
 
+  // *********************************************************************************
+  // Internal
+  {  "name"    : "Internal Release CID QRTR",
+     "type"    : "Message",
+     "service" : "CTL",
+     "id"      : "0xFF23",
+     "since"   : "1.0",
+     "input"   : [  { "name"      : "Release Info",
+                      "id"        : "0x01",
+                      "type"      : "TLV",
+                      "since"     : "1.0",
+                      "format"    : "sequence",
+                      "contents"  : [ { "name"          : "Service",
+                                        "format"        : "guint16",
+                                        "public-format" : "QmiService" },
+                                      { "name"   : "Cid",
+                                        "format" : "guint8" } ] } ],
+     "output"  : [  { "common-ref" : "Operation Result" },
+                    { "name"      : "Release Info",
+                      "id"        : "0x01",
+                      "type"      : "TLV",
+                      "since"     : "1.0",
+                      "format"    : "sequence",
+                      "contents"  : [ { "name"          : "Service",
+                                        "format"        : "guint16",
+                                        "public-format" : "QmiService" },
+                                      { "name"   : "Cid",
+                                        "format" : "guint8" } ],
+                      "prerequisites": [ { "common-ref" : "Success" } ] } ] }
 ]
diff --git a/data/qmi-service-dms.json b/data/qmi-service-dms.json
index 0a226b0..a45a7b5 100644
--- a/data/qmi-service-dms.json
+++ b/data/qmi-service-dms.json
@@ -176,9 +176,10 @@ 
                                         "format"        : "guint8",
                                         "public-format" : "QmiDmsSimCapability" },
                                       { "name"   : "Radio Interface List",
-                                        "format" : "array",
-                                        "array-element" : { "format"        : "guint8",
-                                                            "public-format" : "QmiDmsRadioInterface" } } ],
+                                        "format"             : "array",
+                                        "size-prefix-format" : "guint8",
+                                        "array-element"      : { "format"        : "guint8",
+                                                                 "public-format" : "QmiDmsRadioInterface" } } ],
                       "prerequisites": [ { "common-ref" : "Success" } ] } ] },
 
   // *********************************************************************************
@@ -244,25 +245,27 @@ 
      "id"      : "0x0025",
      "since"   : "1.0",
      "output"  : [  { "common-ref" : "Operation Result" },
-                    { "name"      : "Esn",
-                      "id"        : "0x10",
-                      "type"      : "TLV",
-                      "since"     : "1.0",
-                      "format"    : "string",
-                      "prerequisites": [ { "common-ref" : "Success" } ] },
-                    { "name"      : "Imei",
-                      "id"        : "0x11",
-                      "type"      : "TLV",
-                      "since"     : "1.0",
-                      "format"    : "string",
-                      "max-size"  : "15",
-                      "prerequisites": [ { "common-ref" : "Success" } ] },
-                    { "name"      : "Meid",
-                      "id"        : "0x12",
-                      "type"      : "TLV",
-                      "since"     : "1.0",
-                      "format"    : "string",
-                      "prerequisites": [ { "common-ref" : "Success" } ] },
+                    { "name"          : "Esn",
+                      "id"            : "0x10",
+                      "type"          : "TLV",
+                      "since"         : "1.0",
+                      "format"        : "string",
+                      "prerequisites" : [ { "common-ref" : "Success" } ] },
+                    { "name"          : "Imei",
+                      "id"            : "0x11",
+                      "type"          : "TLV",
+                      "since"         : "1.0",
+                      "format"        : "string",
+                      "max-size"      : "15",
+                      "personal-info" : "true",
+                      "prerequisites" : [ { "common-ref" : "Success" } ] },
+                    { "name"          : "Meid",
+                      "id"            : "0x12",
+                      "type"          : "TLV",
+                      "since"         : "1.0",
+                      "format"        : "string",
+                      "personal-info" : "true",
+                      "prerequisites" : [ { "common-ref" : "Success" } ] },
                     { "name"      : "Imei Software Version",
                       "id"        : "0x13",
                       "type"      : "TLV",
@@ -305,8 +308,9 @@ 
                                       { "name"          : "Protection Enabled",
                                         "format"        : "guint8",
                                         "public-format" : "gboolean" },
-                                      { "name"   : "PIN",
-                                        "format" : "string" } ] } ],
+                                      { "name"          : "PIN",
+                                        "format"        : "string",
+                                        "personal-info" : "true" } ] } ],
      "output"  : [  { "common-ref" : "Operation Result" },
                     { "name"      : "Pin Retries Status",
                       "id"        : "0x10",
@@ -333,8 +337,9 @@ 
                       "contents"  : [ { "name"          : "Pin ID",
                                         "format"        : "guint8",
                                         "public-format" : "QmiDmsUimPinId" },
-                                      { "name"   : "PIN",
-                                        "format" : "string" } ] } ],
+                                      { "name"          : "PIN",
+                                        "format"        : "string",
+                                        "personal-info" : "true" } ] } ],
      "output"  : [  { "common-ref" : "Operation Result" },
                     { "name"      : "Pin Retries Status",
                       "id"        : "0x10",
@@ -361,10 +366,12 @@ 
                       "contents"  : [ { "name"          : "Pin ID",
                                         "format"        : "guint8",
                                         "public-format" : "QmiDmsUimPinId" },
-                                      { "name"   : "PUK",
-                                        "format" : "string" },
-                                      { "name"   : "New PIN",
-                                        "format" : "string" } ] } ],
+                                      { "name"          : "PUK",
+                                        "format"        : "string",
+                                        "personal-info" : "true" },
+                                      { "name"          : "New PIN",
+                                        "format"        : "string",
+                                        "personal-info" : "true" } ] } ],
      "output"  : [  { "common-ref" : "Operation Result" },
                     { "name"      : "Pin Retries Status",
                       "id"        : "0x10",
@@ -391,10 +398,12 @@ 
                       "contents"  : [ { "name"          : "Pin ID",
                                         "format"        : "guint8",
                                         "public-format" : "QmiDmsUimPinId" },
-                                      { "name"   : "Old PIN",
-                                        "format" : "string" },
-                                      { "name"   : "New PIN",
-                                        "format" : "string" } ] } ],
+                                      { "name"          : "Old PIN",
+                                        "format"        : "string",
+                                        "personal-info" : "true" },
+                                      { "name"          : "New PIN",
+                                        "format"        : "string",
+                                        "personal-info" : "true" } ] } ],
      "output"  : [  { "common-ref" : "Operation Result" },
                     { "name"      : "Pin Retries Status",
                       "id"        : "0x10",
@@ -586,37 +595,40 @@ 
      "service" : "DMS",
      "id"      : "0x0033",
      "since"   : "1.0",
-     "input"   : [  { "name"      : "Info",
-                      "id"        : "0x01",
-                      "type"      : "TLV",
+     "input"   : [  { "name"          : "Info",
+                      "id"            : "0x01",
+                      "type"          : "TLV",
                       // API updated in 1.6
-                      "since"     : "1.6",
-                      "format"    : "sequence",
-                      "contents"  : [ { "name"       : "Service Programming Code",
-                                        "format"     : "string",
-                                        "fixed-size" : "6" },
-                                      { "name"   : "System Identification Number",
-                                        "format" : "guint16" },
-                                      { "name"     : "Mobile Directory Number",
-                                        "format"   : "string",
-                                        "max-size" : "15" },
-                                      { "name"     : "Mobile Identification Number",
-                                        "format"   : "string",
-                                        "max-size" : "15" } ] },
+                      "since"         : "1.6",
+                      "format"        : "sequence",
+                      "contents"      : [ { "name"       : "Service Programming Code",
+                                            "format"     : "string",
+                                            "fixed-size" : "6" },
+                                          { "name"   : "System Identification Number",
+                                            "format" : "guint16" },
+                                          { "name"     : "Mobile Directory Number",
+                                            "format"   : "string",
+                                            "max-size" : "15" },
+                                          { "name"     : "Mobile Identification Number",
+                                            "format"   : "string",
+                                            "max-size" : "15" } ],
+                      "personal-info" : "true" },
                     { "name"               : "MN HA key",
                       "id"                 : "0x11",
                       "type"               : "TLV",
                       "since"              : "1.0",
                       "format"             : "string",
                       "max-size"           : "16",
-                      "size-prefix-format" : "guint8" },
+                      "size-prefix-format" : "guint8",
+                      "personal-info"      : "true" },
                     { "name"               : "MN AAA key",
                       "id"                 : "0x12",
                       "type"               : "TLV",
                       "since"              : "1.0",
                       "format"             : "string",
                       "max-size"           : "16",
-                      "size-prefix-format" : "guint8" },
+                      "size-prefix-format" : "guint8",
+                      "personal-info"      : "true" },
                     { "name"      : "PRL",
                       "id"        : "0x13",
                       "type"      : "TLV",
@@ -624,7 +636,7 @@ 
                       "format"    : "sequence",
                       "contents"  : [ { "name"   : "PRL total length",
                                         "format" : "guint16" },
-                                      { "name"   : "PRL segment",
+                                      { "name"                   : "PRL segment",
                                         "format"                 : "array",
                                         "size-prefix-format"     : "guint16",
                                         "sequence-prefix-format" : "guint8",
@@ -660,9 +672,10 @@ 
                       "contents"  : [ { "name"          : "Enabled",
                                         "format"        : "guint8",
                                         "public-format" : "gboolean" },
-                                      { "name"       : "Lock Code",
-                                        "format"     : "string",
-                                        "fixed-size" : "4" } ] } ],
+                                      { "name"          : "Lock Code",
+                                        "format"        : "string",
+                                        "fixed-size"    : "4",
+                                        "personal-info" : "true" } ] } ],
      "output"  : [  { "common-ref" : "Operation Result" } ] },
 
   // *********************************************************************************
@@ -766,12 +779,13 @@ 
      "id"      : "0x003C",
      "since"   : "1.0",
      "output"  : [  { "common-ref" : "Operation Result" },
-                    { "name"      : "ICCID",
-                      "id"        : "0x01",
-                      "type"      : "TLV",
-                      "since"     : "1.0",
-                      "format"    : "string",
-                      "prerequisites": [ { "common-ref" : "Success" } ] } ] },
+                    { "name"          : "ICCID",
+                      "id"            : "0x01",
+                      "type"          : "TLV",
+                      "since"         : "1.0",
+                      "format"        : "string",
+                      "personal-info" : "true",
+                      "prerequisites" : [ { "common-ref" : "Success" } ] } ] },
 
   // *********************************************************************************
   {  "name"    : "Set Firmware ID",
@@ -871,12 +885,13 @@ 
      "id"      : "0x0043",
      "since"   : "1.0",
      "output"  : [  { "common-ref" : "Operation Result" },
-                    { "name"      : "IMSI",
-                      "id"        : "0x01",
-                      "type"      : "TLV",
-                      "since"     : "1.0",
-                      "format"    : "string",
-                      "prerequisites": [ { "common-ref" : "Success" } ] } ] },
+                    { "name"          : "IMSI",
+                      "id"            : "0x01",
+                      "type"          : "TLV",
+                      "since"         : "1.0",
+                      "format"        : "string",
+                      "personal-info" : "true",
+                      "prerequisites" : [ { "common-ref" : "Success" } ] } ] },
 
   // *********************************************************************************
   {  "name"    : "UIM Get State",
@@ -921,6 +936,14 @@ 
                       "format"             : "array",
                       "size-prefix-format" : "guint16",
                       "array-element"      : { "format" : "guint16" },
+                      "prerequisites"      : [ { "common-ref" : "Success" } ] },
+                    { "name"               : "NR5G Band Capability",
+                      "id"                 : "0x13",
+                      "type"               : "TLV",
+                      "since"              : "1.32",
+                      "format"             : "array",
+                      "size-prefix-format" : "guint16",
+                      "array-element"      : { "format" : "guint16" },
                       "prerequisites"      : [ { "common-ref" : "Success" } ] } ] },
 
   // *********************************************************************************
@@ -944,23 +967,24 @@ 
      "id"      : "0x0047",
      "since"   : "1.0",
      "output"  : [ { "common-ref" : "Operation Result" },
-                   { "name"          : "List",
-                     "id"            : "0x01",
-                     "type"          : "TLV",
-                     "since"        : "1.0",
-                     "format"        : "array",
-                     "array-element" : { "name"     : "Image",
-                                         "format"   : "struct",
-                                         "contents" : [ { "name"          : "Type",
-                                                          "format"        : "guint8",
-                                                          "public-format" : "QmiDmsFirmwareImageType" },
-                                                        { "name"          : "Unique ID",
-                                                          "format"        : "array",
-                                                          "fixed-size"    : "16",
-                                                          "array-element" : { "format": "guint8" } },
-                                                        { "name"   : "Build ID",
-                                                          "format" : "string" } ] },
-                     "prerequisites"   : [ { "common-ref" : "Success" } ] } ] },
+                   { "name"               : "List",
+                     "id"                 : "0x01",
+                     "type"               : "TLV",
+                     "since"              : "1.0",
+                     "format"             : "array",
+                     "size-prefix-format" : "guint8",
+                     "array-element"      : { "name"     : "Image",
+                                              "format"   : "struct",
+                                              "contents" : [ { "name"          : "Type",
+                                                               "format"        : "guint8",
+                                                               "public-format" : "QmiDmsFirmwareImageType" },
+                                                             { "name"          : "Unique ID",
+                                                               "format"        : "array",
+                                                               "fixed-size"    : "16",
+                                                               "array-element" : { "format": "guint8" } },
+                                                             { "name"   : "Build ID",
+                                                               "format" : "string" } ] },
+                     "prerequisites"      : [ { "common-ref" : "Success" } ] } ] },
 
   // *********************************************************************************
   {  "name"    : "Set Firmware Preference",
@@ -968,22 +992,23 @@ 
      "service" : "DMS",
      "id"      : "0x0048",
      "since"   : "1.0",
-     "input"   : [ { "name"          : "List",
-                     "id"            : "0x01",
-                     "type"          : "TLV",
-                     "since"         : "1.0",
-                     "format"        : "array",
-                     "array-element" : { "name"     : "Image",
-                                         "format"   : "struct",
-                                         "contents" : [ { "name"          : "Type",
-                                                          "format"        : "guint8",
-                                                          "public-format" : "QmiDmsFirmwareImageType" },
-                                                        { "name"          : "Unique ID",
-                                                          "format"        : "array",
-                                                          "fixed-size"    : "16",
-                                                          "array-element" : { "format": "guint8" } },
-                                                        { "name"   : "Build ID",
-                                                          "format" : "string" } ] } },
+     "input"   : [ { "name"               : "List",
+                     "id"                 : "0x01",
+                     "type"               : "TLV",
+                     "since"              : "1.0",
+                     "format"             : "array",
+                     "size-prefix-format" : "guint8",
+                     "array-element"      : { "name"     : "Image",
+                                              "format"   : "struct",
+                                              "contents" : [ { "name"          : "Type",
+                                                               "format"        : "guint8",
+                                                               "public-format" : "QmiDmsFirmwareImageType" },
+                                                             { "name"          : "Unique ID",
+                                                               "format"        : "array",
+                                                               "fixed-size"    : "16",
+                                                               "array-element" : { "format": "guint8" } },
+                                                             { "name"   : "Build ID",
+                                                               "format" : "string" } ] } },
                    { "name"          : "Download Override",
                      "id"            : "0x10",
                      "type"          : "TLV",
@@ -996,15 +1021,16 @@ 
                      "since"         : "1.0",
                      "format"        : "guint8" } ],
      "output"  : [ { "common-ref" : "Operation Result" },
-                   { "name"          : "Image Download List",
-                     "id"            : "0x01",
-                     "type"          : "TLV",
-                     "since"         : "1.0",
-                     "format"        : "array",
-                     "array-element" : { "name"     : "Image Type",
-                                         "format"   : "guint8",
-                                         "public-format" : "QmiDmsFirmwareImageType" },
-                     "prerequisites"   : [ { "common-ref" : "Success" } ] } ] },
+                   { "name"               : "Image Download List",
+                     "id"                 : "0x01",
+                     "type"               : "TLV",
+                     "since"              : "1.0",
+                     "format"             : "array",
+                     "size-prefix-format" : "guint8",
+                     "array-element"      : { "name"     : "Image Type",
+                                              "format"   : "guint8",
+                                              "public-format" : "QmiDmsFirmwareImageType" },
+                     "prerequisites"      : [ { "common-ref" : "Success" } ] } ] },
 
   // *********************************************************************************
   {  "name"    : "List Stored Images",
@@ -1013,35 +1039,37 @@ 
      "id"      : "0x0049",
      "since"   : "1.0",
      "output"  : [ { "common-ref" : "Operation Result" },
-                   { "name"          : "List",
-                     "id"            : "0x01",
-                     "type"          : "TLV",
-                     "since"         : "1.0",
-                     "format"        : "array",
-                     "array-element" : { "name"     : "Image",
-                                         "format"   : "struct",
-                                         "contents" : [ { "name"          : "Type",
-                                                          "format"        : "guint8",
-                                                          "public-format" : "QmiDmsFirmwareImageType" },
-                                                        { "name"   : "Maximum Images",
-                                                          "format" : "guint8" },
-                                                        { "name"   : "Index Of Running Image",
-                                                          "format" : "guint8" },
-                                                        { "name"          : "Sublist",
-                                                          "format"        : "array",
-                                                          "array-element" : { "name"     : "Sublist Element",
-                                                                              "format"   : "struct",
-                                                                              "contents" : [ { "name"   : "Storage Index",
-                                                                                               "format" : "guint8" },
-                                                                                             { "name"   : "Failure Count",
-                                                                                               "format" : "guint8" },
-                                                                                             { "name"          : "Unique ID",
-                                                                                               "format"        : "array",
-                                                                                               "fixed-size"    : "16",
-                                                                                               "array-element" : { "format": "guint8" } },
-                                                                                             { "name"   : "Build ID",
-                                                                                               "format" : "string" } ] } } ] },
-                     "prerequisites" : [ { "common-ref" : "Success" } ] } ] },
+                   { "name"               : "List",
+                     "id"                 : "0x01",
+                     "type"               : "TLV",
+                     "since"              : "1.0",
+                     "format"             : "array",
+                     "size-prefix-format" : "guint8",
+                     "array-element"      : { "name"     : "Image",
+                                              "format"   : "struct",
+                                              "contents" : [ { "name"          : "Type",
+                                                               "format"        : "guint8",
+                                                               "public-format" : "QmiDmsFirmwareImageType" },
+                                                             { "name"   : "Maximum Images",
+                                                               "format" : "guint8" },
+                                                             { "name"   : "Index Of Running Image",
+                                                               "format" : "guint8" },
+                                                             { "name"               : "Sublist",
+                                                               "format"             : "array",
+                                                               "size-prefix-format" : "guint8",
+                                                               "array-element"      : { "name"     : "Sublist Element",
+                                                                                        "format"   : "struct",
+                                                                                        "contents" : [ { "name"   : "Storage Index",
+                                                                                                         "format" : "guint8" },
+                                                                                                       { "name"   : "Failure Count",
+                                                                                                         "format" : "guint8" },
+                                                                                                       { "name"          : "Unique ID",
+                                                                                                         "format"        : "array",
+                                                                                                         "fixed-size"    : "16",
+                                                                                                         "array-element" : { "format": "guint8" } },
+                                                                                                       { "name"   : "Build ID",
+                                                                                                         "format" : "string" } ] } } ] },
+                     "prerequisites"      : [ { "common-ref" : "Success" } ] } ] },
 
   // *********************************************************************************
   {  "name"    : "Delete Stored Image",
@@ -1049,11 +1077,11 @@ 
      "service" : "DMS",
      "id"      : "0x004A",
      "since"   : "1.0",
-     "input"   : [ { "name"      : "Image",
+     "input"   : [ { "name"      : "Image Details",
                      "id"        : "0x01",
                      "type"      : "TLV",
-                     "since"     : "1.0",
-                     "format"    : "struct",
+                     "since"     : "1.32",
+                     "format"    : "sequence",
                      "contents"  : [ { "name"          : "Type",
                                        "format"        : "guint8",
                                        "public-format" : "QmiDmsFirmwareImageType" },
@@ -1091,11 +1119,11 @@ 
      "service" : "DMS",
      "id"      : "0x004C",
      "since"   : "1.0",
-     "input"   : [ { "name"      : "Image",
+     "input"   : [ { "name"      : "Image Details",
                      "id"        : "0x01",
                      "type"      : "TLV",
-                     "since"     : "1.0",
-                     "format"    : "struct",
+                     "since"     : "1.32",
+                     "format"    : "sequence",
                      "contents"  : [ { "name"          : "Type",
                                        "format"        : "guint8",
                                        "public-format" : "QmiDmsFirmwareImageType" },
@@ -1240,13 +1268,14 @@ 
                       "format"        : "guint32",
                       "public-format" : "QmiDmsMacType" } ],
      "output"  : [  { "common-ref" : "Operation Result" },
-                    { "name"          : "MAC Address",
-                      "id"            : "0x10",
-                      "type"          : "TLV",
-                      "since"         : "1.26",
-                      "format"        : "array",
-                      "array-element" : { "format": "guint8" },
-                      "prerequisites": [ { "common-ref" : "Success" } ] } ] },
+                    { "name"               : "MAC Address",
+                      "id"                 : "0x10",
+                      "type"               : "TLV",
+                      "since"              : "1.26",
+                      "format"             : "array",
+                      "size-prefix-format" : "guint8",
+                      "array-element"      : { "format": "guint8" },
+                      "prerequisites"      : [ { "common-ref" : "Success" } ] } ] },
 
   // *********************************************************************************
   {  "name"    : "Get Supported Messages",
@@ -1357,14 +1386,15 @@ 
                      "format"        : "guint8",
                      "public-format" : "QmiDmsSwiUsbComposition",
                      "prerequisites" : [ { "common-ref" : "Success" } ] },
-                   { "name"          : "Supported",
-                     "id"            : "0x11",
-                     "type"          : "TLV",
-                     "since"         : "1.20",
-                     "format"        : "array",
-                     "array-element" : { "format"        : "guint8",
-                                         "public-format" : "QmiDmsSwiUsbComposition" },
-                     "prerequisites" : [ { "common-ref" : "Success" } ] } ] },
+                   { "name"               : "Supported",
+                     "id"                 : "0x11",
+                     "type"               : "TLV",
+                     "since"              : "1.20",
+                     "format"             : "array",
+                     "size-prefix-format" : "guint8",
+                     "array-element"      : { "format"        : "guint8",
+                                              "public-format" : "QmiDmsSwiUsbComposition" },
+                     "prerequisites"      : [ { "common-ref" : "Success" } ] } ] },
 
   // *********************************************************************************
   {  "name"    : "Swi Set USB Composition",
@@ -1439,6 +1469,30 @@ 
                      "type"          : "TLV",
                      "since"         : "1.28.6",
                      "format"        : "guint8" } ],
-     "output"  : [ { "common-ref" : "Operation Result" } ] }
+     "output"  : [ { "common-ref" : "Operation Result" } ] },
 
+  // *********************************************************************************
+  {  "name"    : "Foxconn Set FCC Authentication v2",
+     "type"    : "Message",
+     "service" : "DMS",
+     "id"      : "0x5571",
+     // this vendor id number just needs to be different to any other one
+     // defined in other messages; in this case both are foxconn messages, so
+     // we +1 the foxconn vid. A better solution would be to rename this field
+     // to something like "unique-id" and forget about defining any vendor id
+     // there.
+     "vendor"  : "0x0490",
+     "since"   : "1.32",
+     "input"   : [ { "name"          : "Magic String",
+                     "id"            : "0x01",
+                     "type"          : "TLV",
+                     "since"         : "1.32",
+                     "format"        : "string" },
+                   { "name"          : "Magic Number",
+                     "id"            : "0x02",
+                     "type"          : "TLV",
+                     "since"         : "1.32",
+                     "format"        : "guint8",
+                     "prerequisites" : "0x01-first" } ],
+     "output"  : [ { "common-ref" : "Operation Result" } ] }
 ]
diff --git a/data/qmi-service-nas.json b/data/qmi-service-nas.json
index 2602e40..9379995 100644
--- a/data/qmi-service-nas.json
+++ b/data/qmi-service-nas.json
@@ -54,6 +54,7 @@ 
      "id"                 : "0x12",
      "type"               : "TLV",
      "format"             : "array",
+     "size-prefix-format" : "guint8",
      "array-element"      : { "name" : "Element",
                               "format"   : "struct",
                               "contents" : [ { "name"          : "Name Encoding",
@@ -68,12 +69,14 @@ 
                                              { "name"          : "Short Name Spare Bits",
                                                "format"        : "guint8",
                                                "public-format" : "QmiNasPlmnNameSpareBits" },
-                                             { "name"          : "Long Name",
-                                               "format"        : "array",
-                                               "array-element" : { "format" : "guint8" } },
-                                             { "name"          : "Short Name",
-                                               "format"        : "array",
-                                               "array-element" : { "format" : "guint8" } } ] } },
+                                             { "name"               : "Long Name",
+                                               "format"             : "array",
+                                               "size-prefix-format" : "guint8",
+                                               "array-element"      : { "format" : "guint8" } },
+                                             { "name"               : "Short Name",
+                                               "format"             : "array",
+                                               "size-prefix-format" : "guint8",
+                                               "array-element"      : { "format" : "guint8" } } ] } },
 
    { "common-ref"         : "NAS Operator String Name",
      "name"               : "Operator String Name",
@@ -99,11 +102,13 @@ 
                                 "format"        : "guint8",
                                 "public-format" : "QmiNasPlmnNameSpareBits" },
                               { "name"          : "Long Name",
-                                "format"        : "array",
-                                "array-element" : { "format" : "guint8" } },
-                              { "name"          : "Short Name",
-                                "format"        : "array",
-                                "array-element" : { "format" : "guint8" } } ] },
+                                "format"             : "array",
+                                "size-prefix-format" : "guint8",
+                                "array-element"      : { "format" : "guint8" } },
+                              { "name"               : "Short Name",
+                                "format"             : "array",
+                                "size-prefix-format" : "guint8",
+                                "array-element"      : { "format" : "guint8" } } ] },
 
    { "common-ref"         : "NAS Preferred Networks",
      "name"               : "Preferred Networks",
@@ -158,9 +163,10 @@ 
                       "contents"  : [ { "name"          : "Report",
                                         "format"        : "guint8",
                                         "public-format" : "gboolean" },
-                                      { "name"          : "Thresholds",
-                                        "format"        : "array",
-                                        "array-element" : { "format" : "gint8" } } ] },
+                                      { "name"               : "Thresholds",
+                                        "format"             : "array",
+                                        "size-prefix-format" : "guint8",
+                                        "array-element"      : { "format" : "gint8" } } ] },
                     { "name"          : "RF Band Information",
                       "id"            : "0x11",
                       "type"          : "TLV",
@@ -227,9 +233,10 @@ 
                       "contents"  : [ { "name"          : "Report",
                                         "format"        : "guint8",
                                         "public-format" : "gboolean" },
-                                      { "name"          : "Thresholds",
-                                        "format"        : "array",
-                                        "array-element" : { "format" : "gint16" } } ] },
+                                      { "name"               : "Thresholds",
+                                        "format"             : "array",
+                                        "size-prefix-format" : "guint8",
+                                        "array-element"      : { "format" : "gint16" } } ] },
                     { "name"      : "SINR Threshold",
                       "id"        : "0x1A",
                       "type"      : "TLV",
@@ -238,9 +245,10 @@ 
                       "contents"  : [ { "name"          : "Report",
                                         "format"        : "guint8",
                                         "public-format" : "gboolean" },
-                                      { "name"          : "Thresholds",
-                                        "format"        : "array",
-                                        "array-element" : { "format" : "guint8" } } ] },
+                                      { "name"               : "Thresholds",
+                                        "format"             : "array",
+                                        "size-prefix-format" : "guint8",
+                                        "array-element"      : { "format" : "guint8" } } ] },
                     { "name"      : "LTE SNR Delta",
                       "id"        : "0x1B",
                       "type"      : "TLV",
@@ -283,6 +291,7 @@ 
                       "type"               : "TLV",
                       "since"              : "1.0",
                       "format"             : "array",
+                      "size-prefix-format" : "guint8",
                       "array-element"      : { "name"     : "Element",
                                                "format"   : "struct",
                                                "contents" : [ { "name"          : "Radio Interface",
@@ -745,10 +754,11 @@ 
                                       { "name"          : "Selected Network",
                                         "format"        : "guint8",
                                         "public-format" : "QmiNasNetworkType" },
-                                      { "name"          : "Radio Interfaces",
-                                        "format"        : "array",
-                                        "array-element" : { "format"        : "gint8",
-                                                            "public-format" : "QmiNasRadioInterface" } } ],
+                                      { "name"               : "Radio Interfaces",
+                                        "format"             : "array",
+                                        "size-prefix-format" : "guint8",
+                                        "array-element"      : { "format"        : "gint8",
+                                                                 "public-format" : "QmiNasRadioInterface" } } ],
                       "prerequisites": [ { "common-ref" : "Success" } ] },
                     { "name"          : "Roaming Indicator",
                       "id"            : "0x10",
@@ -756,13 +766,14 @@ 
                       "since"         : "1.0",
                       "format"        : "guint8",
                       "public-format" : "QmiNasRoamingIndicatorStatus" },
-                    { "name"          : "Data Service Capability",
-                      "id"            : "0x11",
-                      "type"          : "TLV",
-                      "since"         : "1.0",
-                      "format"        : "array",
-                      "array-element" : { "format"        : "guint8",
-                                          "public-format" : "QmiNasDataCapability" } },
+                    { "name"               : "Data Service Capability",
+                      "id"                 : "0x11",
+                      "type"               : "TLV",
+                      "since"              : "1.0",
+                      "format"             : "array",
+                      "size-prefix-format" : "guint8",
+                      "array-element"      : { "format"        : "guint8",
+                                               "public-format" : "QmiNasDataCapability" } },
                     { "name"      : "Current PLMN",
                       "id"        : "0x12",
                       "type"      : "TLV",
@@ -794,19 +805,20 @@ 
                                         "format" : "gint32" },
                                       { "name"   : "Base Station Longitude",
                                         "format" : "gint32" } ] },
-                    { "name"      : "Roaming Indicator List",
-                      "id"        : "0x15",
-                      "type"      : "TLV",
-                      "since"     : "1.0",
-                      "format"        : "array",
-                      "array-element" : { "name"     : "Element",
-                                          "format"   : "struct",
-                                          "contents" : [ { "name"          : "Radio Interface",
-                                                           "format"        : "guint8",
-                                                           "public-format" : "QmiNasRadioInterface" },
-                                                         { "name"          : "Roaming Indicator",
-                                                           "format"        : "guint8",
-                                                           "public-format" : "QmiNasRoamingIndicatorStatus" } ] } },
+                    { "name"               : "Roaming Indicator List",
+                      "id"                 : "0x15",
+                      "type"               : "TLV",
+                      "since"              : "1.0",
+                      "format"             : "array",
+                      "size-prefix-format" : "guint8",
+                      "array-element"      : { "name"     : "Element",
+                                               "format"   : "struct",
+                                               "contents" : [ { "name"          : "Radio Interface",
+                                                                "format"        : "guint8",
+                                                                "public-format" : "QmiNasRadioInterface" },
+                                                              { "name"          : "Roaming Indicator",
+                                                                "format"        : "guint8",
+                                                                "public-format" : "QmiNasRoamingIndicatorStatus" } ] } },
                     { "name"          : "Default Roaming Indicator",
                       "id"            : "0x16",
                       "type"          : "TLV",
@@ -965,23 +977,25 @@ 
                                       { "name"          : "Selected Network",
                                         "format"        : "guint8",
                                         "public-format" : "QmiNasNetworkType" },
-                                      { "name"          : "Radio Interfaces",
-                                        "format"        : "array",
-                                        "array-element" : { "format"        : "gint8",
-                                                            "public-format" : "QmiNasRadioInterface" } } ] },
+                                      { "name"               : "Radio Interfaces",
+                                        "format"             : "array",
+                                        "size-prefix-format" : "guint8",
+                                        "array-element"      : { "format"        : "gint8",
+                                                                 "public-format" : "QmiNasRadioInterface" } } ] },
                     { "name"          : "Roaming Indicator",
                       "id"            : "0x10",
                       "type"          : "TLV",
                       "since"         : "1.0",
                       "format"        : "guint8",
                       "public-format" : "QmiNasRoamingIndicatorStatus" },
-                    { "name"          : "Data Service Capability",
-                      "id"            : "0x11",
-                      "type"          : "TLV",
-                      "since"         : "1.0",
-                      "format"        : "array",
-                      "array-element" : { "format"        : "guint8",
-                                          "public-format" : "QmiNasDataCapability" } },
+                    { "name"               : "Data Service Capability",
+                      "id"                 : "0x11",
+                      "type"               : "TLV",
+                      "since"              : "1.0",
+                      "format"             : "array",
+                      "size-prefix-format" : "guint8",
+                      "array-element"      : { "format"        : "guint8",
+                                               "public-format" : "QmiNasDataCapability" } },
                     { "name"      : "Current PLMN",
                       "id"        : "0x12",
                       "type"      : "TLV",
@@ -1013,19 +1027,20 @@ 
                                         "format" : "gint32" },
                                       { "name"   : "Base Station Longitude",
                                         "format" : "gint32" } ] },
-                    { "name"      : "Roaming Indicator List",
-                      "id"        : "0x15",
-                      "type"      : "TLV",
-                      "since"     : "1.0",
-                      "format"        : "array",
-                      "array-element" : { "name"     : "Element",
-                                          "format"   : "struct",
-                                          "contents" : [ { "name"          : "Radio Interface",
-                                                           "format"        : "guint8",
-                                                           "public-format" : "QmiNasRadioInterface" },
-                                                         { "name"          : "Roaming Indicator",
-                                                           "format"        : "guint8",
-                                                           "public-format" : "QmiNasRoamingIndicatorStatus" } ] } },
+                    { "name"               : "Roaming Indicator List",
+                      "id"                 : "0x15",
+                      "type"               : "TLV",
+                      "since"              : "1.0",
+                      "format"             : "array",
+                      "size-prefix-format" : "guint8",
+                      "array-element"      : { "name"     : "Element",
+                                               "format"   : "struct",
+                                               "contents" : [ { "name"          : "Radio Interface",
+                                                                "format"        : "guint8",
+                                                                "public-format" : "QmiNasRadioInterface" },
+                                                              { "name"          : "Roaming Indicator",
+                                                                "format"        : "guint8",
+                                                                "public-format" : "QmiNasRoamingIndicatorStatus" } ] } },
                     { "name"          : "Default Roaming Indicator",
                       "id"            : "0x16",
                       "type"          : "TLV",
@@ -1236,9 +1251,10 @@ 
                                       { "name"          : "Description Encoding",
                                         "format"        : "guint8",
                                         "public-format" : "QmiNasNetworkDescriptionEncoding" },
-                                      { "name"          : "Description",
-                                        "format"        : "array",
-                                        "array-element" : { "format" : "guint8" } } ] },
+                                      { "name"               : "Description",
+                                        "format"             : "array",
+                                        "size-prefix-format" : "guint8",
+                                        "array-element"      : { "format" : "guint8" } } ] },
                     { "name"      : "Home Network 3GPP MNC",
                       "id"        : "0x12",
                       "type"      : "TLV",
@@ -1366,49 +1382,52 @@ 
      "id"      : "0x0031",
      "since"   : "1.0",
      "output"  : [  { "common-ref" : "Operation Result" },
-                    { "name"          : "List",
-                      "id"            : "0x01",
-                      "type"          : "TLV",
-                      "since"         : "1.0",
-                      "format"        : "array",
-                      "array-element" : { "name"     : "Element",
-                                          "format"   : "struct",
-                                          "contents" : [ { "name"          : "Radio Interface",
-                                                           "format"        : "gint8",
-                                                           "public-format" : "QmiNasRadioInterface" },
-                                                         { "name"          : "Active Band Class",
-                                                           "format"        : "guint16",
-                                                           "public-format" : "QmiNasActiveBand" },
-                                                         { "name"          : "Active Channel",
-                                                           "format"        : "guint16" } ] } },
-                    { "name"          : "Extended List",
-                      "id"            : "0x11",
-                      "type"          : "TLV",
-                      "since"         : "1.26",
-                      "format"        : "array",
-                      "array-element" : { "name"     : "Element",
-                                          "format"   : "struct",
-                                          "contents" : [ { "name"          : "Radio Interface",
-                                                           "format"        : "gint8",
-                                                           "public-format" : "QmiNasRadioInterface" },
-                                                         { "name"          : "Active Band Class",
-                                                           "format"        : "guint16",
-                                                           "public-format" : "QmiNasActiveBand" },
-                                                         { "name"          : "Active Channel",
-                                                           "format"        : "guint32" } ] } },
-                    { "name"          : "Bandwidth List",
-                      "id"            : "0x12",
-                      "type"          : "TLV",
-                      "since"         : "1.26",
-                      "format"        : "array",
-                      "array-element" : { "name"     : "Element",
-                                          "format"   : "struct",
-                                          "contents" : [ { "name"          : "Radio Interface",
-                                                           "format"        : "gint8",
-                                                           "public-format" : "QmiNasRadioInterface" },
-                                                         { "name"          : "Bandwidth",
-                                                           "format"        : "guint32",
-                                                           "public-format" : "QmiNasDLBandwidth" } ] } } ] },
+                    { "name"               : "List",
+                      "id"                 : "0x01",
+                      "type"               : "TLV",
+                      "since"              : "1.0",
+                      "format"             : "array",
+                      "size-prefix-format" : "guint8",
+                      "array-element"      : { "name"     : "Element",
+                                               "format"   : "struct",
+                                               "contents" : [ { "name"          : "Radio Interface",
+                                                                "format"        : "gint8",
+                                                                "public-format" : "QmiNasRadioInterface" },
+                                                              { "name"          : "Active Band Class",
+                                                                "format"        : "guint16",
+                                                                "public-format" : "QmiNasActiveBand" },
+                                                              { "name"          : "Active Channel",
+                                                                "format"        : "guint16" } ] } },
+                    { "name"               : "Extended List",
+                      "id"                 : "0x11",
+                      "type"               : "TLV",
+                      "since"              : "1.26",
+                      "format"             : "array",
+                      "size-prefix-format" : "guint8",
+                      "array-element"      : { "name"     : "Element",
+                                               "format"   : "struct",
+                                               "contents" : [ { "name"          : "Radio Interface",
+                                                                "format"        : "gint8",
+                                                                "public-format" : "QmiNasRadioInterface" },
+                                                              { "name"          : "Active Band Class",
+                                                                "format"        : "guint16",
+                                                                "public-format" : "QmiNasActiveBand" },
+                                                              { "name"          : "Active Channel",
+                                                                "format"        : "guint32" } ] } },
+                    { "name"               : "Bandwidth List",
+                      "id"                 : "0x12",
+                      "type"               : "TLV",
+                      "since"              : "1.26",
+                      "format"             : "array",
+                      "size-prefix-format" : "guint8",
+                      "array-element"      : { "name"     : "Element",
+                                               "format"   : "struct",
+                                               "contents" : [ { "name"          : "Radio Interface",
+                                                                "format"        : "gint8",
+                                                                "public-format" : "QmiNasRadioInterface" },
+                                                              { "name"          : "Bandwidth",
+                                                                "format"        : "guint32",
+                                                                "public-format" : "QmiNasDLBandwidth" } ] } } ] },
 
   // *********************************************************************************
   {  "name"    : "Set System Selection Preference",
@@ -1532,6 +1551,48 @@ 
                                           { "name"   : "Mask Mid High",
                                             "format" : "guint64" },
                                           { "name"   : "Mask High",
+                                            "format" : "guint64" } ] },
+                    { "name"          : "NR5G SA Band Preference",
+                      "id"            : "0x2F",
+                      "type"          : "TLV",
+                      "since"         : "1.32",
+                      "format"        : "sequence",
+                      "contents"      : [ { "name"   : "Mask 0",
+                                            "format" : "guint64" },
+                                          { "name"   : "Mask 1",
+                                            "format" : "guint64" },
+                                          { "name"   : "Mask 2",
+                                            "format" : "guint64" },
+                                          { "name"   : "Mask 3",
+                                            "format" : "guint64" },
+                                          { "name"   : "Mask 4",
+                                            "format" : "guint64" },
+                                          { "name"   : "Mask 5",
+                                            "format" : "guint64" },
+                                          { "name"   : "Mask 6",
+                                            "format" : "guint64" },
+                                          { "name"   : "Mask 7",
+                                            "format" : "guint64" } ] },
+                    { "name"          : "NR5G NSA Band Preference",
+                      "id"            : "0x30",
+                      "type"          : "TLV",
+                      "since"         : "1.32",
+                      "format"        : "sequence",
+                      "contents"      : [ { "name"   : "Mask 0",
+                                            "format" : "guint64" },
+                                          { "name"   : "Mask 1",
+                                            "format" : "guint64" },
+                                          { "name"   : "Mask 2",
+                                            "format" : "guint64" },
+                                          { "name"   : "Mask 3",
+                                            "format" : "guint64" },
+                                          { "name"   : "Mask 4",
+                                            "format" : "guint64" },
+                                          { "name"   : "Mask 5",
+                                            "format" : "guint64" },
+                                          { "name"   : "Mask 6",
+                                            "format" : "guint64" },
+                                          { "name"   : "Mask 7",
                                             "format" : "guint64" } ] } ],
      "output"  : [  { "common-ref" : "Operation Result" } ] },
 
@@ -1658,6 +1719,48 @@ 
                                           { "name"   : "Mask Mid High",
                                             "format" : "guint64" },
                                           { "name"   : "Mask High",
+                                            "format" : "guint64" } ] },
+                    { "name"          : "NR5G SA Band Preference",
+                      "id"            : "0x2C",
+                      "type"          : "TLV",
+                      "since"         : "1.32",
+                      "format"        : "sequence",
+                      "contents"      : [ { "name"   : "Mask 0",
+                                            "format" : "guint64" },
+                                          { "name"   : "Mask 1",
+                                            "format" : "guint64" },
+                                          { "name"   : "Mask 2",
+                                            "format" : "guint64" },
+                                          { "name"   : "Mask 3",
+                                            "format" : "guint64" },
+                                          { "name"   : "Mask 4",
+                                            "format" : "guint64" },
+                                          { "name"   : "Mask 5",
+                                            "format" : "guint64" },
+                                          { "name"   : "Mask 6",
+                                            "format" : "guint64" },
+                                          { "name"   : "Mask 7",
+                                            "format" : "guint64" } ] },
+                    { "name"          : "NR5G NSA Band Preference",
+                      "id"            : "0x2D",
+                      "type"          : "TLV",
+                      "since"         : "1.32",
+                      "format"        : "sequence",
+                      "contents"      : [ { "name"   : "Mask 0",
+                                            "format" : "guint64" },
+                                          { "name"   : "Mask 1",
+                                            "format" : "guint64" },
+                                          { "name"   : "Mask 2",
+                                            "format" : "guint64" },
+                                          { "name"   : "Mask 3",
+                                            "format" : "guint64" },
+                                          { "name"   : "Mask 4",
+                                            "format" : "guint64" },
+                                          { "name"   : "Mask 5",
+                                            "format" : "guint64" },
+                                          { "name"   : "Mask 6",
+                                            "format" : "guint64" },
+                                          { "name"   : "Mask 7",
                                             "format" : "guint64" } ] } ] },
 
   // *********************************************************************************
@@ -1705,6 +1808,7 @@ 
      "service" : "NAS",
      "id"      : "0x0043",
      "since"   : "1.10",
+     "output-compat" : "yes",
      "output"  : [  { "common-ref" : "Operation Result" },
                     { "name"      : "GERAN Info v2",
                       "id"        : "0x10",
@@ -1727,24 +1831,25 @@ 
                                         "format" : "guint32" },
                                       { "name"   : "RX Level",
                                         "format" : "guint16" },
-                                      { "name"          : "Cell",
-                                        "format"        : "array",
-                                        "array-element" : { "name"     : "Element",
-                                                            "format"   : "struct",
-                                                            "contents" : [ { "name"   : "Cell ID",
-                                                                             "format" : "guint32" },
-                                                                           { "name"          : "PLMN",
-                                                                             "format"        : "array",
-                                                                             "fixed-size"    : "3",
-                                                                             "array-element" : { "format" : "guint8" } },
-                                                                           { "name"   : "LAC",
-                                                                             "format" : "guint16" },
-                                                                           { "name"   : "GERAN Absolute RF Channel Number",
-                                                                             "format" : "guint16" },
-                                                                           { "name"   : "Base Station Identity Code",
-                                                                             "format" : "guint8" },
-                                                                           { "name"   : "RX Level",
-                                                                             "format" : "guint16" } ] } } ] },
+                                      { "name"               : "Cell",
+                                        "format"             : "array",
+                                        "size-prefix-format" : "guint8",
+                                        "array-element"      : { "name"     : "Element",
+                                                                 "format"   : "struct",
+                                                                 "contents" : [ { "name"   : "Cell ID",
+                                                                                  "format" : "guint32" },
+                                                                                { "name"          : "PLMN",
+                                                                                  "format"        : "array",
+                                                                                  "fixed-size"    : "3",
+                                                                                  "array-element" : { "format" : "guint8" } },
+                                                                                { "name"   : "LAC",
+                                                                                  "format" : "guint16" },
+                                                                                { "name"   : "GERAN Absolute RF Channel Number",
+                                                                                  "format" : "guint16" },
+                                                                                { "name"   : "Base Station Identity Code",
+                                                                                  "format" : "guint8" },
+                                                                                { "name"   : "RX Level",
+                                                                                  "format" : "guint16" } ] } } ] },
                     { "name"      : "UMTS Info v2",
                       "id"        : "0x11",
                       "type"      : "TLV",
@@ -1766,30 +1871,32 @@ 
                                         "format" : "gint16" },
                                       { "name"   : "ECIO",
                                         "format" : "gint16" },
-                                      { "name"          : "Cell",
-                                        "format"        : "array",
-                                        "array-element" : { "name"     : "Element",
-                                                            "format"   : "struct",
-                                                            "contents" : [ { "name"   : "UTRA Absolute RF Channel Number",
-                                                                             "format" : "guint16" },
-                                                                           { "name"   : "Primary Scrambling Code",
-                                                                             "format" : "guint16" },
-                                                                           { "name"   : "RSCP",
-                                                                             "format" : "gint16" },
-                                                                           { "name"   : "ECIO",
-                                                                             "format" : "gint16" } ] } },
-                                      { "name"          : "Neighboring GERAN",
-                                        "format"        : "array",
-                                        "array-element" : { "name"     : "Element",
-                                                            "format"   : "struct",
-                                                            "contents" : [ { "name"   : "GERAN Absolute RF Channel Number",
-                                                                             "format" : "guint16" },
-                                                                           { "name"   : "Network Color Code",
-                                                                             "format" : "guint8" },
-                                                                           { "name"   : "Base Station Color Code",
-                                                                             "format" : "guint8" },
-                                                                           { "name"   : "RSSI",
-                                                                             "format" : "gint16" } ] } } ] },
+                                      { "name"               : "Cell",
+                                        "format"             : "array",
+                                        "size-prefix-format" : "guint8",
+                                        "array-element"      : { "name"     : "Element",
+                                                                 "format"   : "struct",
+                                                                 "contents" : [ { "name"   : "UTRA Absolute RF Channel Number",
+                                                                                  "format" : "guint16" },
+                                                                                { "name"   : "Primary Scrambling Code",
+                                                                                  "format" : "guint16" },
+                                                                                { "name"   : "RSCP",
+                                                                                  "format" : "gint16" },
+                                                                                { "name"   : "ECIO",
+                                                                                  "format" : "gint16" } ] } },
+                                      { "name"               : "Neighboring GERAN",
+                                        "format"             : "array",
+                                        "size-prefix-format" : "guint8",
+                                        "array-element"      : { "name"     : "Element",
+                                                                 "format"   : "struct",
+                                                                 "contents" : [ { "name"   : "GERAN Absolute RF Channel Number",
+                                                                                  "format" : "guint16" },
+                                                                                { "name"   : "Network Color Code",
+                                                                                  "format" : "guint8" },
+                                                                                { "name"   : "Base Station Color Code",
+                                                                                  "format" : "guint8" },
+                                                                                { "name"   : "RSSI",
+                                                                                  "format" : "gint16" } ] } } ] },
                     { "name"      : "CDMA Info",
                       "id"        : "0x12",
                       "type"      : "TLV",
@@ -1835,20 +1942,21 @@ 
                                         "format" : "guint8" },
                                       { "name"   : "S Intra Search Threshold",
                                         "format" : "guint8" },
-                                      { "name"          : "Cell",
-                                        "format"        : "array",
-                                        "array-element" : { "name"     : "Element",
-                                                            "format"   : "struct",
-                                                            "contents" : [ { "name"   : "Physical Cell ID",
-                                                                             "format" : "guint16" },
-                                                                           { "name"   : "RSRQ",
-                                                                             "format" : "gint16" },
-                                                                           { "name"   : "RSRP",
-                                                                             "format" : "gint16" },
-                                                                           { "name"   : "RSSI",
-                                                                             "format" : "gint16" },
-                                                                           { "name"   : "Cell Selection RX Level",
-                                                                             "format" : "gint16" } ] } } ] },
+                                      { "name"               : "Cell",
+                                        "format"             : "array",
+                                        "size-prefix-format" : "guint8",
+                                        "array-element"      : { "name"     : "Element",
+                                                                 "format"   : "struct",
+                                                                 "contents" : [ { "name"   : "Physical Cell ID",
+                                                                                  "format" : "guint16" },
+                                                                                { "name"   : "RSRQ",
+                                                                                  "format" : "gint16" },
+                                                                                { "name"   : "RSRP",
+                                                                                  "format" : "gint16" },
+                                                                                { "name"   : "RSSI",
+                                                                                  "format" : "gint16" },
+                                                                                { "name"   : "Cell Selection RX Level",
+                                                                                  "format" : "gint16" } ] } } ] },
                     { "name"      : "Interfrequency LTE Info",
                       "id"        : "0x14",
                       "type"      : "TLV",
@@ -1857,32 +1965,34 @@ 
                       "contents"  : [ { "name"          : "UE In Idle",
                                         "format"        : "guint8",
                                         "public-format" : "gboolean" },
-                                      { "name"          : "Frequency",
-                                        "format"        : "array",
-                                        "array-element" : { "name"     : "Element",
-                                                            "format"   : "struct",
-                                                            "contents" : [ { "name"   : "EUTRA Absolute RF Channel Number",
-                                                                             "format" : "guint16" },
-                                                                           { "name"   : "Cell Selection RX Level Low Threshold",
-                                                                             "format" : "guint8" },
-                                                                           { "name"   : "Cell Selection RX Level High Threshold",
-                                                                             "format" : "guint8" },
-                                                                           { "name"   : "Cell Reselection Priority",
-                                                                             "format" : "guint8" },
-                                                                           { "name"          : "Cell",
-                                                                             "format"        : "array",
-                                                                             "array-element" : { "name"     : "Element",
-                                                                                                 "format"   : "struct",
-                                                                                                 "contents" : [ { "name"   : "Physical Cell ID",
-                                                                                                                  "format" : "guint16" },
-                                                                                                                { "name"   : "RSRQ",
-                                                                                                                  "format" : "gint16" },
-                                                                                                                { "name"   : "RSRP",
-                                                                                                                  "format" : "gint16" },
-                                                                                                                { "name"   : "RSSI",
-                                                                                                                  "format" : "gint16" },
-                                                                                                                { "name"   : "Cell Selection RX Level",
-                                                                                                                  "format" : "gint16" } ] } } ] } } ] },
+                                      { "name"               : "Frequency",
+                                        "format"             : "array",
+                                        "size-prefix-format" : "guint8",
+                                        "array-element"      : { "name"     : "Element",
+                                                                 "format"   : "struct",
+                                                                 "contents" : [ { "name"   : "EUTRA Absolute RF Channel Number",
+                                                                                  "format" : "guint16" },
+                                                                                { "name"   : "Cell Selection RX Level Low Threshold",
+                                                                                  "format" : "guint8" },
+                                                                                { "name"   : "Cell Selection RX Level High Threshold",
+                                                                                  "format" : "guint8" },
+                                                                                { "name"   : "Cell Reselection Priority",
+                                                                                  "format" : "guint8" },
+                                                                                { "name"               : "Cell",
+                                                                                  "format"             : "array",
+                                                                                  "size-prefix-format" : "guint8",
+                                                                                  "array-element"      : { "name"     : "Element",
+                                                                                                           "format"   : "struct",
+                                                                                                           "contents" : [ { "name"   : "Physical Cell ID",
+                                                                                                                            "format" : "guint16" },
+                                                                                                                          { "name"   : "RSRQ",
+                                                                                                                            "format" : "gint16" },
+                                                                                                                          { "name"   : "RSRP",
+                                                                                                                            "format" : "gint16" },
+                                                                                                                          { "name"   : "RSSI",
+                                                                                                                            "format" : "gint16" },
+                                                                                                                          { "name"   : "Cell Selection RX Level",
+                                                                                                                            "format" : "gint16" } ] } } ] } } ] },
                     { "name"      : "LTE Info Neighboring GSM",
                       "id"        : "0x15",
                       "type"      : "TLV",
@@ -1891,36 +2001,38 @@ 
                       "contents"  : [ { "name"          : "UE In Idle",
                                         "format"        : "guint8",
                                         "public-format" : "gboolean" },
-                                      { "name"          : "Frequency",
-                                        "format"        : "array",
-                                        "array-element" : { "name"     : "Element",
-                                                            "format"   : "struct",
-                                                            "contents" : [ { "name"   : "Cell Reselection Priority",
-                                                                             "format" : "guint8" },
-                                                                           { "name"   : "Cell Reselection High Threshold",
-                                                                             "format" : "guint8" },
-                                                                           { "name"   : "Cell Reselection Low Threshold",
-                                                                             "format" : "guint8" },
-                                                                           { "name"   : "NCC Permitted",
-                                                                             "format" : "guint8" },
-                                                                           { "name"          : "Cell",
-                                                                             "format"        : "array",
-                                                                             "array-element" : { "name"     : "Element",
-                                                                                                 "format"   : "struct",
-                                                                                                 "contents" : [ { "name"   : "GERAN Absolute RF Channel Number",
-                                                                                                                  "format" : "guint16" },
-                                                                                                                { "name"          : "Band Is 1900",
-                                                                                                                  "format"        : "guint8",
-                                                                                                                  "public-format" : "gboolean" },
-                                                                                                                { "name"          : "Cell ID Valid",
-                                                                                                                  "format"        : "guint8",
-                                                                                                                  "public-format" : "gboolean" },
-                                                                                                                { "name"   : "Base Station Identity Code",
-                                                                                                                  "format" : "guint8" },
-                                                                                                                { "name"   : "RSSI",
-                                                                                                                  "format" : "gint16" },
-                                                                                                                { "name"   : "Cell Selection RX Level",
-                                                                                                                  "format" : "gint16" } ] } } ] } } ] },
+                                      { "name"               : "Frequency",
+                                        "format"             : "array",
+                                        "size-prefix-format" : "guint8",
+                                        "array-element"      : { "name"     : "Element",
+                                                                 "format"   : "struct",
+                                                                 "contents" : [ { "name"   : "Cell Reselection Priority",
+                                                                                  "format" : "guint8" },
+                                                                                { "name"   : "Cell Reselection High Threshold",
+                                                                                  "format" : "guint8" },
+                                                                                { "name"   : "Cell Reselection Low Threshold",
+                                                                                  "format" : "guint8" },
+                                                                                { "name"   : "NCC Permitted",
+                                                                                  "format" : "guint8" },
+                                                                                { "name"               : "Cell",
+                                                                                  "format"             : "array",
+                                                                                  "size-prefix-format" : "guint8",
+                                                                                  "array-element"      : { "name"     : "Element",
+                                                                                                           "format"   : "struct",
+                                                                                                           "contents" : [ { "name"   : "GERAN Absolute RF Channel Number",
+                                                                                                                            "format" : "guint16" },
+                                                                                                                          { "name"          : "Band Is 1900",
+                                                                                                                            "format"        : "guint8",
+                                                                                                                            "public-format" : "gboolean" },
+                                                                                                                          { "name"          : "Cell ID Valid",
+                                                                                                                            "format"        : "guint8",
+                                                                                                                            "public-format" : "gboolean" },
+                                                                                                                          { "name"   : "Base Station Identity Code",
+                                                                                                                            "format" : "guint8" },
+                                                                                                                          { "name"   : "RSSI",
+                                                                                                                            "format" : "gint16" },
+                                                                                                                          { "name"   : "Cell Selection RX Level",
+                                                                                                                            "format" : "gint16" } ] } } ] } } ] },
                     { "name"      : "LTE Info Neighboring WCDMA",
                       "id"        : "0x16",
                       "type"      : "TLV",
@@ -1929,30 +2041,32 @@ 
                       "contents"  : [ { "name"          : "UE In Idle",
                                         "format"        : "guint8",
                                         "public-format" : "gboolean" },
-                                      { "name"          : "Frequency",
-                                        "format"        : "array",
-                                        "array-element" : { "name"     : "Element",
-                                                            "format"   : "struct",
-                                                            "contents" : [ { "name"   : "UTRA Absolute RF Channel Number",
-                                                                             "format" : "guint16" },
-                                                                           { "name"   : "Cell Reselection Priority",
-                                                                             "format" : "guint8" },
-                                                                           { "name"   : "Cell Reselection High Threshold",
-                                                                             "format" : "guint16" },
-                                                                           { "name"   : "Cell Reselection Low Threshold",
-                                                                             "format" : "guint16" },
-                                                                           { "name"          : "Cell",
-                                                                             "format"        : "array",
-                                                                             "array-element" : { "name"     : "Element",
-                                                                                                 "format"   : "struct",
-                                                                                                 "contents" : [ { "name"   : "Primary Scrambling Code",
-                                                                                                                  "format" : "guint16" },
-                                                                                                                { "name"   : "CPICH RSCP",
-                                                                                                                  "format" : "gint16" },
-                                                                                                                { "name"   : "CPICH EcNo",
-                                                                                                                  "format" : "gint16" },
-                                                                                                                { "name"   : "Cell Selection RX Level",
-                                                                                                                  "format" : "gint16" } ] } } ] } } ] },
+                                      { "name"               : "Frequency",
+                                        "format"             : "array",
+                                        "size-prefix-format" : "guint8",
+                                        "array-element"      : { "name"     : "Element",
+                                                                 "format"   : "struct",
+                                                                 "contents" : [ { "name"   : "UTRA Absolute RF Channel Number",
+                                                                                  "format" : "guint16" },
+                                                                                { "name"   : "Cell Reselection Priority",
+                                                                                  "format" : "guint8" },
+                                                                                { "name"   : "Cell Reselection High Threshold",
+                                                                                  "format" : "guint16" },
+                                                                                { "name"   : "Cell Reselection Low Threshold",
+                                                                                  "format" : "guint16" },
+                                                                                { "name"               : "Cell",
+                                                                                  "format"             : "array",
+                                                                                  "size-prefix-format" : "guint8",
+                                                                                  "array-element"      : { "name"     : "Element",
+                                                                                                           "format"   : "struct",
+                                                                                                           "contents" : [ { "name"   : "Primary Scrambling Code",
+                                                                                                                            "format" : "guint16" },
+                                                                                                                          { "name"   : "CPICH RSCP",
+                                                                                                                            "format" : "gint16" },
+                                                                                                                          { "name"   : "CPICH EcNo",
+                                                                                                                            "format" : "gint16" },
+                                                                                                                          { "name"   : "Cell Selection RX Level",
+                                                                                                                            "format" : "gint16" } ] } } ] } } ] },
                     { "name"      : "UMTS Cell ID",
                       "id"        : "0x17",
                       "type"      : "TLV",
@@ -1966,23 +2080,24 @@ 
                       "contents"  : [ { "name"          : "RRC state",
                                         "format"        : "guint32",
                                         "public-format" : "QmiNasWcdmaRrcState" },
-                                      { "name"          : "Frequency",
-                                        "format"        : "array",
-                                        "array-element" : { "name"     : "Element",
-                                                            "format"   : "struct",
-                                                            "contents" : [ { "name"   : "EUTRA Absolute RF Channel Number",
-                                                                             "format" : "guint16" },
-                                                                           { "name"   : "Physical Cell ID",
-                                                                             "format" : "guint16" },
-                                                                           { "name"   : "RSRP",
-                                                                             "format" : "gfloat" },
-                                                                           { "name"   : "RSRQ",
-                                                                             "format" : "gfloat" },
-                                                                           { "name"   : "Cell Selection RX Level",
-                                                                             "format" : "gint16" },
-                                                                           { "name"          : "Is TDD",
-                                                                             "format"        : "guint8",
-                                                                             "public-format" : "gboolean" } ] } } ] },
+                                      { "name"               : "Frequency",
+                                        "format"             : "array",
+                                        "size-prefix-format" : "guint8",
+                                        "array-element"      : { "name"     : "Element",
+                                                                 "format"   : "struct",
+                                                                 "contents" : [ { "name"   : "EUTRA Absolute RF Channel Number",
+                                                                                  "format" : "guint16" },
+                                                                                { "name"   : "Physical Cell ID",
+                                                                                  "format" : "guint16" },
+                                                                                { "name"   : "RSRP",
+                                                                                  "format" : "gfloat" },
+                                                                                { "name"   : "RSRQ",
+                                                                                  "format" : "gfloat" },
+                                                                                { "name"   : "Cell Selection RX Level",
+                                                                                  "format" : "gint16" },
+                                                                                { "name"          : "Is TDD",
+                                                                                  "format"        : "guint8",
+                                                                                  "public-format" : "gboolean" } ] } } ] },
                     { "name"      : "LTE Info Timing Advance",
                       "id"        : "0x1E",
                       "type"      : "TLV",
@@ -3778,6 +3893,11 @@ 
                       "id"        : "0x18",
                       "type"      : "TLV",
                       "since"     : "1.26.2",
+                      "format"    : "gint16" },
+                    { "name"      : "WCDMA RSCP",
+                      "id"        : "0x19",
+                      "type"      : "TLV",
+                      "since"     : "1.34",
                       "format"    : "gint16" } ] },
 
   // *********************************************************************************
@@ -3786,48 +3906,55 @@ 
      "service" : "NAS",
      "id"      : "0x0050",
      "since"   : "1.0",
-     "input"   : [  { "name"          : "RSSI Threshold",
-                      "id"            : "0x10",
-                      "type"          : "TLV",
-                      "since"         : "1.0",
-                      "format"        : "array",
-                      "array-element" : { "format" : "gint8" } },
-                    { "name"          : "ECIO Threshold",
-                      "id"            : "0x11",
-                      "type"          : "TLV",
-                      "since"         : "1.0",
-                      "format"        : "array",
-                      "array-element" : { "format" : "gint16" } },
-                    { "name"          : "SINR Threshold",
-                      "id"            : "0x12",
-                      "type"          : "TLV",
-                      "since"         : "1.0",
-                      "format"        : "array",
-                      "array-element" : { "format" : "guint8" } },
-                    { "name"          : "LTE SNR Threshold",
-                      "id"            : "0x13",
-                      "type"          : "TLV",
-                      "since"         : "1.0",
-                      "format"        : "array",
-                      "array-element" : { "format" : "gint16" } },
-                    { "name"          : "IO Threshold",
-                      "id"            : "0x14",
-                      "type"          : "TLV",
-                      "since"         : "1.0",
-                      "format"        : "array",
-                      "array-element" : { "format" : "gint32" } },
-                    { "name"          : "RSRQ Threshold",
-                      "id"            : "0x15",
-                      "type"          : "TLV",
-                      "since"         : "1.0",
-                      "format"        : "array",
-                      "array-element" : { "format" : "gint8" } },
-                    { "name"          : "RSRP Threshold",
-                      "id"            : "0x16",
-                      "type"          : "TLV",
-                      "since"         : "1.0",
-                      "format"        : "array",
-                      "array-element" : { "format" : "gint16" } },
+     "input"   : [  { "name"               : "RSSI Threshold",
+                      "id"                 : "0x10",
+                      "type"               : "TLV",
+                      "since"              : "1.0",
+                      "format"             : "array",
+                      "size-prefix-format" : "guint8",
+                      "array-element"      : { "format" : "gint8" } },
+                    { "name"               : "ECIO Threshold",
+                      "id"                 : "0x11",
+                      "type"               : "TLV",
+                      "since"              : "1.0",
+                      "format"             : "array",
+                      "size-prefix-format" : "guint8",
+                      "array-element"      : { "format" : "gint16" } },
+                    { "name"               : "SINR Threshold",
+                      "id"                 : "0x12",
+                      "type"               : "TLV",
+                      "since"              : "1.0",
+                      "format"             : "array",
+                      "size-prefix-format" : "guint8",
+                      "array-element"      : { "format" : "guint8" } },
+                    { "name"               : "LTE SNR Threshold",
+                      "id"                 : "0x13",
+                      "type"               : "TLV",
+                      "since"              : "1.0",
+                      "format"             : "array",
+                      "size-prefix-format" : "guint8",
+                      "array-element"      : { "format" : "gint16" } },
+                    { "name"               : "IO Threshold",
+                      "id"                 : "0x14",
+                      "type"               : "TLV",
+                      "since"              : "1.0",
+                      "format"             : "array",
+                      "size-prefix-format" : "guint8",
+                      "array-element"      : { "format" : "gint32" } },
+                    { "name"               : "RSRQ Threshold",
+                      "id"                 : "0x15",
+                      "type"               : "TLV",
+                      "since"              : "1.0",
+                      "format"             : "array",
+                      "size-prefix-format" : "guint8",
+                      "array-element"      : { "format" : "gint8" } },
+                    { "name"               : "RSRP Threshold",
+                      "id"                 : "0x16",
+                      "type"               : "TLV",
+                      "since"              : "1.0",
+                      "format"             : "array",
+                      "size-prefix-format" : "guint8",
+                      "array-element"      : { "format" : "gint16" } },
                     { "name"      : "LTE Report",
                       "id"        : "0x17",
                       "type"      : "TLV",
@@ -3837,12 +3964,243 @@ 
                                         "format" : "guint8" },
                                       { "name" : "Average Period",
                                         "format" : "guint8" } ] },
-                    { "name"          : "RSCP Threshold",
-                      "id"            : "0x18",
-                      "type"          : "TLV",
-                      "since"         : "1.0",
-                      "format"        : "array",
-                      "array-element" : { "format" : "gint8" } } ],
+                    { "name"               : "RSCP Threshold",
+                      "id"                 : "0x18",
+                      "type"               : "TLV",
+                      "since"              : "1.0",
+                      "format"             : "array",
+                      "size-prefix-format" : "guint8",
+                      "array-element"      : { "format" : "gint8" } } ],
+     "output"  : [  { "common-ref" : "Operation Result" } ] },
+
+  // *********************************************************************************
+  {  "name"    : "Config Signal Info v2",
+     "type"    : "Message",
+     "service" : "NAS",
+     "id"      : "0x006C",
+     "since"   : "1.32",
+     "input"   : [  { "name"               : "CDMA RSSI Threshold List",
+                      "id"                 : "0x10",
+                      "type"               : "TLV",
+                      "since"              : "1.32",
+                      "format"             : "array",
+                      "size-prefix-format" : "guint8",
+                      "array-element"      : { "format" : "gint16" } },
+                    { "name"               : "CDMA RSSI Delta",
+                      "id"                 : "0x11",
+                      "type"               : "TLV",
+                      "since"              : "1.32",
+                      "format"             : "guint16" },
+                    { "name"               : "CDMA ECIO Threshold List",
+                      "id"                 : "0x12",
+                      "type"               : "TLV",
+                      "since"              : "1.32",
+                      "format"             : "array",
+                      "size-prefix-format" : "guint8",
+                      "array-element"      : { "format" : "gint16" } },
+                    { "name"               : "CDMA ECIO Delta",
+                      "id"                 : "0x13",
+                      "type"               : "TLV",
+                      "since"              : "1.32",
+                      "format"             : "guint16" },
+                    { "name"               : "HDR RSSI Threshold List",
+                      "id"                 : "0x14",
+                      "type"               : "TLV",
+                      "since"              : "1.32",
+                      "format"             : "array",
+                      "size-prefix-format" : "guint8",
+                      "array-element"      : { "format" : "gint16" } },
+                    { "name"               : "HDR RSSI Delta",
+                      "id"                 : "0x15",
+                      "type"               : "TLV",
+                      "since"              : "1.32",
+                      "format"             : "guint16" },
+                    { "name"               : "HDR ECIO Threshold List",
+                      "id"                 : "0x16",
+                      "type"               : "TLV",
+                      "since"              : "1.32",
+                      "format"             : "array",
+                      "size-prefix-format" : "guint8",
+                      "array-element"      : { "format" : "gint16" } },
+                    { "name"               : "HDR ECIO Delta",
+                      "id"                 : "0x17",
+                      "type"               : "TLV",
+                      "since"              : "1.32",
+                      "format"             : "guint16" },
+                    { "name"               : "HDR SINR Threshold List",
+                      "id"                 : "0x18",
+                      "type"               : "TLV",
+                      "since"              : "1.32",
+                      "format"             : "array",
+                      "size-prefix-format" : "guint8",
+                      "array-element"      : { "format" : "gint16" } },
+                    { "name"               : "HDR SINR Delta",
+                      "id"                 : "0x19",
+                      "type"               : "TLV",
+                      "since"              : "1.32",
+                      "format"             : "guint16" },
+                    { "name"               : "HDR IO Threshold List",
+                      "id"                 : "0x1A",
+                      "type"               : "TLV",
+                      "since"              : "1.32",
+                      "format"             : "array",
+                      "size-prefix-format" : "guint8",
+                      "array-element"      : { "format" : "gint16" } },
+                    { "name"               : "HDR IO Delta",
+                      "id"                 : "0x1B",
+                      "type"               : "TLV",
+                      "since"              : "1.32",
+                      "format"             : "guint16" },
+                    { "name"               : "GSM RSSI Threshold List",
+                      "id"                 : "0x1C",
+                      "type"               : "TLV",
+                      "since"              : "1.32",
+                      "format"             : "array",
+                      "size-prefix-format" : "guint8",
+                      "array-element"      : { "format" : "gint16" } },
+                    { "name"               : "GSM RSSI Delta",
+                      "id"                 : "0x1D",
+                      "type"               : "TLV",
+                      "since"              : "1.32",
+                      "format"             : "guint16" },
+                    { "name"               : "WCDMA RSSI Threshold List",
+                      "id"                 : "0x1E",
+                      "type"               : "TLV",
+                      "since"              : "1.32",
+                      "format"             : "array",
+                      "size-prefix-format" : "guint8",
+                      "array-element"      : { "format" : "gint16" } },
+                    { "name"               : "WCDMA RSSI Delta",
+                      "id"                 : "0x1F",
+                      "type"               : "TLV",
+                      "since"              : "1.32",
+                      "format"             : "guint16" },
+                    { "name"               : "WCDMA ECIO Threshold List",
+                      "id"                 : "0x20",
+                      "type"               : "TLV",
+                      "since"              : "1.32",
+                      "format"             : "array",
+                      "size-prefix-format" : "guint8",
+                      "array-element"      : { "format" : "gint16" } },
+                    { "name"               : "WCDMA ECIO Delta",
+                      "id"                 : "0x21",
+                      "type"               : "TLV",
+                      "since"              : "1.32",
+                      "format"             : "guint16" },
+                    { "name"               : "LTE RSSI Threshold List",
+                      "id"                 : "0x22",
+                      "type"               : "TLV",
+                      "since"              : "1.32",
+                      "format"             : "array",
+                      "size-prefix-format" : "guint8",
+                      "array-element"      : { "format" : "gint16" } },
+                    { "name"               : "LTE RSSI Delta",
+                      "id"                 : "0x23",
+                      "type"               : "TLV",
+                      "since"              : "1.32",
+                      "format"             : "guint16" },
+                    { "name"               : "LTE SNR Threshold List",
+                      "id"                 : "0x24",
+                      "type"               : "TLV",
+                      "since"              : "1.32",
+                      "format"             : "array",
+                      "size-prefix-format" : "guint8",
+                      "array-element"      : { "format" : "gint16" } },
+                    { "name"               : "LTE SNR Delta",
+                      "id"                 : "0x25",
+                      "type"               : "TLV",
+                      "since"              : "1.32",
+                      "format"             : "guint16" },
+                    { "name"               : "LTE RSRQ Threshold List",
+                      "id"                 : "0x26",
+                      "type"               : "TLV",
+                      "since"              : "1.32",
+                      "format"             : "array",
+                      "size-prefix-format" : "guint8",
+                      "array-element"      : { "format" : "gint16" } },
+                    { "name"               : "LTE RSRQ Delta",
+                      "id"                 : "0x27",
+                      "type"               : "TLV",
+                      "since"              : "1.32",
+                      "format"             : "guint16" },
+                    { "name"               : "LTE RSRP Threshold List",
+                      "id"                 : "0x28",
+                      "type"               : "TLV",
+                      "since"              : "1.32",
+                      "format"             : "array",
+                      "size-prefix-format" : "guint8",
+                      "array-element"      : { "format" : "gint16" } },
+                    { "name"               : "LTE RSRP Delta",
+                      "id"                 : "0x29",
+                      "type"               : "TLV",
+                      "since"              : "1.32",
+                      "format"             : "guint16" },
+                    { "name"               : "LTE Report",
+                      "id"                 : "0x2A",
+                      "type"               : "TLV",
+                      "since"              : "1.32",
+                      "format"             : "sequence",
+                      "contents"           : [ { "name" : "Rate",
+                                                 "format" : "guint8" },
+                                               { "name" : "Average Period",
+                                                 "format" : "guint8" } ] },
+                    { "name"               : "NR5G SNR Threshold List",
+                      "id"                 : "0x33",
+                      "type"               : "TLV",
+                      "since"              : "1.32",
+                      "format"             : "array",
+                      "size-prefix-format" : "guint8",
+                      "array-element"      : { "format" : "gint16" } },
+                    { "name"               : "NR5G SNR Delta",
+                      "id"                 : "0x34",
+                      "type"               : "TLV",
+                      "since"              : "1.32",
+                      "format"             : "guint16" },
+                    { "name"               : "NR5G RSRP Threshold List",
+                      "id"                 : "0x35",
+                      "type"               : "TLV",
+                      "since"              : "1.32",
+                      "format"             : "array",
+                      "size-prefix-format" : "guint8",
+                      "array-element"      : { "format" : "gint16" } },
+                    { "name"               : "NR5G RSRP Delta",
+                      "id"                 : "0x36",
+                      "type"               : "TLV",
+                      "since"              : "1.32",
+                      "format"             : "guint16" },
+                    { "name"               : "NR5G Report",
+                      "id"                 : "0x37",
+                      "type"               : "TLV",
+                      "since"              : "1.32",
+                      "format"             : "sequence",
+                      "contents"           : [ { "name" : "Rate",
+                                                 "format" : "guint8" },
+                                               { "name" : "Average Period",
+                                                 "format" : "guint8" } ] },
+                    { "name"               : "NR5G RSRQ Threshold List",
+                      "id"                 : "0x38",
+                      "type"               : "TLV",
+                      "since"              : "1.32",
+                      "format"             : "array",
+                      "size-prefix-format" : "guint8",
+                      "array-element"      : { "format" : "gint16" } },
+                    { "name"               : "NR5G RSRQ Delta",
+                      "id"                 : "0x39",
+                      "type"               : "TLV",
+                      "since"              : "1.32",
+                      "format"             : "guint16" },
+                    { "name"               : "WCDMA RSCP Threshold List",
+                      "id"                 : "0x3A",
+                      "type"               : "TLV",
+                      "since"              : "1.32",
+                      "format"             : "array",
+                      "size-prefix-format" : "guint8",
+                      "array-element"      : { "format" : "gint16" } },
+                    { "name"               : "WCDMA RSCP Delta",
+                      "id"                 : "0x3B",
+                      "type"               : "TLV",
+                      "since"              : "1.32",
+                      "format"             : "guint16" } ],
      "output"  : [  { "common-ref" : "Operation Result" } ] },
 
   // *********************************************************************************
@@ -3905,7 +4263,26 @@ 
                       "id"        : "0x15",
                       "type"      : "TLV",
                       "since"     : "1.0",
-                      "format"    : "gint8" } ] },
+                      "format"    : "gint8" },
+                    { "name"      : "5G Signal Strength",
+                      "id"        : "0x17",
+                      "type"      : "TLV",
+                      "since"     : "1.32",
+                      "format"    : "sequence",
+                      "contents"  : [ { "name"   : "RSRP",
+                                        "format" : "gint16" },
+                                      { "name"   : "SNR",
+                                        "format" : "gint16" } ] },
+                    { "name"      : "5G Signal Strength Extended",
+                      "id"        : "0x18",
+                      "type"      : "TLV",
+                      "since"     : "1.32",
+                      "format"    : "gint16" },
+                    { "name"      : "WCDMA RSCP",
+                      "id"        : "0x19",
+                      "type"      : "TLV",
+                      "since"     : "1.34",
+                      "format"    : "gint16" } ] },
 
   // *********************************************************************************
   {  "name"    : "Get Tx Rx Info",
diff --git a/data/qmi-service-uim.json b/data/qmi-service-uim.json
index 1fa7bae..35edd8e 100644
--- a/data/qmi-service-uim.json
+++ b/data/qmi-service-uim.json
@@ -51,8 +51,9 @@ 
                                                                   { "name"               : "Applications",
                                                                     "format"             : "array",
                                                                     "size-prefix-format" : "guint8",
-                                                                    "array-element"      : { "name"   : "Element",
+                                                                    "array-element"      : { "name"   : "Element V2",
                                                                                              "format" : "struct",
+                                                                                             "since"  : "1.34",
                                                                                              "contents" : [ { "name"          : "Type",
                                                                                                               "format"        : "guint8",
                                                                                                               "public-format" : "QmiUimCardApplicationType" },
@@ -64,7 +65,7 @@ 
                                                                                                               "public-format" : "QmiUimCardApplicationPersonalizationState" },
                                                                                                             { "name"          : "Personalization Feature",
                                                                                                               "format"        : "guint8",
-                                                                                                              "public-format" : "QmiUimCardApplicationPersonalizationFeature" },
+                                                                                                              "public-format" : "QmiUimCardApplicationPersonalizationFeatureStatus" },
                                                                                                             { "name"   : "Personalization Retries",
                                                                                                               "format" : "guint8" },
                                                                                                             { "name"   : "Personalization Unblock Retries",
@@ -127,7 +128,8 @@ 
                                             { "name"               : "ICCID",
                                               "format"             : "array",
                                               "size-prefix-format" : "guint8",
-                                              "array-element"      : { "format" : "guint8" } } ] } },
+                                              "array-element"      : { "format" : "guint8" },
+                                              "personal-info"      : "true" } ] } },
 
   // *********************************************************************************
   { "common-ref"         : "Physical Slot Information",
@@ -153,17 +155,20 @@ 
                                          "public-format" : "gboolean" } ] } },
 
   // *********************************************************************************
-  { "common-ref"         : "Slot EID Information",
-    "name"               : "Slot EID Information",
-    "fullname"           : "Qmi Slot EID Information",
+  { "common-ref"         : "Slot EID",
+    "name"               : "Slot EID",
+    "fullname"           : "Qmi Slot EID",
     "id"                 : "0x12",
     "type"               : "TLV",
     "format"             : "array",
     "size-prefix-format" : "guint8",
-    "array-element" : { "name"               : "EID",
-                        "format"             : "array",
-                        "size-prefix-format" : "guint8",
-                        "array-element"      : { "format" : "guint8" } } },
+    "array-element"      : { "name"     : "Element",
+                             "format"   : "struct",
+                             "contents" : [ { "name"               : "EID",
+                                              "format"             : "array",
+                                              "size-prefix-format" : "guint8",
+                                              "array-element"      : { "format" : "guint8" },
+                                              "personal-info"      : "true" } ] } },
 
   // *********************************************************************************
   {  "name"    : "Reset",
@@ -205,8 +210,9 @@ 
                      "contents"  : [ { "name"   : "File ID",
                                        "format" : "guint16" },
                                      { "name"   : "File Path",
-                                       "format" : "array",
-                                       "array-element" : { "format" : "guint8" } } ] },
+                                       "format"             : "array",
+                                       "size-prefix-format" : "guint8",
+                                       "array-element"      : { "format" : "guint8" } } ] },
                    { "name"      : "Read Information",
                      "id"        : "0x03",
                      "type"      : "TLV",
@@ -244,6 +250,7 @@ 
                      "format"             : "array",
                      "size-prefix-format" : "guint16",
                      "array-element"      : { "format" : "guint8" },
+                     "personal-info"      : "true",
                      "prerequisites"      : [ { "common-ref" : "Success" } ] },
                    { "name"          : "Response In Indication Token",
                      "id"            : "0x12",
@@ -275,8 +282,9 @@ 
                      "contents"  : [ { "name"   : "File ID",
                                        "format" : "guint16" },
                                      { "name"   : "File Path",
-                                       "format" : "array",
-                                       "array-element" : { "format" : "guint8" } } ] },
+                                       "format"             : "array",
+                                       "size-prefix-format" : "guint8",
+                                       "array-element"      : { "format" : "guint8" } } ] },
                    { "name"      : "Record",
                      "id"        : "0x03",
                      "type"      : "TLV",
@@ -313,6 +321,7 @@ 
                      "format"             : "array",
                      "size-prefix-format" : "guint16",
                      "array-element"      : { "format" : "guint8" },
+                     "personal-info"      : "true",
                      "prerequisites"      : [ { "common-ref" : "Success" } ] },
                    { "name"               : "Additional Read Result",
                      "id"                 : "0x12",
@@ -321,6 +330,7 @@ 
                      "format"             : "array",
                      "size-prefix-format" : "guint16",
                      "array-element"      : { "format" : "guint8" },
+                     "personal-info"      : "true",
                      "prerequisites"      : [ { "common-ref" : "Success" } ] },
                    { "name"          : "Response In Indication Token",
                      "id"            : "0x13",
@@ -345,8 +355,9 @@ 
                      "contents"  : [ { "name"   : "File ID",
                                        "format" : "guint16" },
                                      { "name"   : "File Path",
-                                       "format" : "array",
-                                       "array-element" : { "format" : "guint8" } } ] },
+                                       "format"             : "array",
+                                       "size-prefix-format" : "guint8",
+                                       "array-element"      : { "format" : "guint8" } } ] },
                    { "name"      : "Response In Indication Token",
                      "id"        : "0x10",
                      "type"      : "TLV",
@@ -440,7 +451,8 @@ 
                                        "format"        : "guint8",
                                        "public-format" : "gboolean" },
                                      { "name"          : "PIN Value",
-                                       "format"        : "string" } ] },
+                                       "format"        : "string",
+                                       "personal-info" : "true" } ] },
                    { "name"      : "Response In Indication Token",
                      "id"        : "0x11",
                      "type"      : "TLV",
@@ -481,7 +493,8 @@ 
                                        "format"        : "guint8",
                                        "public-format" : "QmiUimPinId" },
                                      { "name"          : "PIN Value",
-                                       "format"        : "string" } ] },
+                                       "format"        : "string",
+                                       "personal-info" : "true" } ] },
                    { "name"      : "Response In Indication Token",
                      "id"        : "0x12",
                      "type"      : "TLV",
@@ -531,9 +544,11 @@ 
                                        "format"        : "guint8",
                                        "public-format" : "QmiUimPinId" },
                                      { "name"          : "PUK",
-                                       "format"        : "string" },
+                                       "format"        : "string",
+                                       "personal-info" : "true" },
                                      { "name"          : "New PIN",
-                                       "format"        : "string" } ] },
+                                       "format"        : "string",
+                                       "personal-info" : "true" } ] },
                    { "name"      : "Response In Indication Token",
                      "id"        : "0x11",
                      "type"      : "TLV",
@@ -583,9 +598,11 @@ 
                                        "format"        : "guint8",
                                        "public-format" : "QmiUimPinId" },
                                      { "name"          : "Old PIN",
-                                       "format"        : "string" },
+                                       "format"        : "string",
+                                       "personal-info" : "true" },
                                      { "name"          : "New PIN",
-                                       "format"        : "string" } ] },
+                                       "format"        : "string",
+                                       "personal-info" : "true" } ] },
                    { "name"      : "Response In Indication Token",
                      "id"        : "0x11",
                      "type"      : "TLV",
@@ -818,7 +835,8 @@ 
                                            "format"        : "guint8",
                                            "public-format" : "QmiUimDepersonalizationOperation" },
                                          { "name"          : "Control Key",
-                                           "format"        : "string" } ] },
+                                           "format"        : "string",
+                                           "personal-info" : "true" } ] },
                    { "name"          : "Slot",
                      "id"            : "0x10",
                      "type"          : "TLV",
@@ -848,6 +866,7 @@ 
                      "since"         : "1.30",
                      "format"        : "guint32",
                      "public-format" : "QmiUimConfiguration" } ],
+     "output-compat" : "yes",
      "output"  : [ { "common-ref"    : "Operation Result" },
                    { "name"          : "Automatic Selection",
                      "id"            : "0x10",
@@ -879,25 +898,27 @@ 
                      "format"        : "guint8",
                      "public-format" : "gboolean",
                      "prerequisites" : [ { "common-ref" : "Success" } ] },
-                   { "name"          : "Personalization Status Other Slots",
-                     "id"            : "0x13",
-                     "type"          : "TLV",
-                     "since"         : "1.30",
-                     "format"        : "array",
+                   { "name"               : "Personalization Status Other",
+                     "id"                 : "0x13",
+                     "type"               : "TLV",
+                     "since"              : "1.32",
+                     "format"             : "array",
                      "size-prefix-format" : "guint8",
-                     "array-element" : { "name"    : "Slots",
-                                         "format"  : "array",
-                                         "size-prefix-format" : "guint8",
-                                         "array-element" : { "name"     : "Element",
-                                                             "format"   : "struct",
-                                                             "contents" : [ { "name"          : "Feature",
-                                                                              "format"        : "guint8",
-                                                                              "public-format" : "QmiUimCardApplicationPersonalizationFeature" },
-                                                                            { "name"          : "Verify Left",
-                                                                              "format"        : "guint8" },
-                                                                            { "name"          : "Unblock Left",
-                                                                              "format"        : "guint8" } ] } },
-                     "prerequisites" : [ { "common-ref" : "Success" } ] } ] },
+                     "array-element"      : { "name"     : "Element",
+                                              "format"   : "struct",
+                                              "contents" : [ { "name"               : "Slot",
+                                                               "format"             : "array",
+                                                               "size-prefix-format" : "guint8",
+                                                               "array-element"      : { "name"     : "Element",
+                                                                                        "format"   : "struct",
+                                                                                        "contents" : [ { "name"          : "Feature",
+                                                                                                         "format"        : "guint8",
+                                                                                                         "public-format" : "QmiUimCardApplicationPersonalizationFeature" },
+                                                                                                       { "name"          : "Verify Left",
+                                                                                                         "format"        : "guint8" },
+                                                                                                       { "name"          : "Unblock Left",
+                                                                                                         "format"        : "guint8" } ] } } ] },
+                     "prerequisites"      : [ { "common-ref" : "Success" } ] } ] },
 
   // *********************************************************************************
   {  "name"    : "Refresh Register All",
@@ -941,13 +962,14 @@ 
      "service" : "UIM",
      "id"      : "0x0047",
      "since"   : "1.26",
+     "output-compat" : "yes",
      "output"  : [ { "common-ref" : "Operation Result" },
                    { "common-ref" : "Physical Slot Status",
                      "since"      : "1.26" },
                    { "common-ref" : "Physical Slot Information",
                      "since"      : "1.26" },
-                   { "common-ref" : "Slot EID Information",
-                     "since"      : "1.26" } ] },
+                   { "common-ref" : "Slot EID",
+                     "since"      : "1.32" } ] },
 
   // *********************************************************************************
   {  "name"    : "Slot Status",
@@ -955,11 +977,36 @@ 
      "service" : "UIM",
      "id"      : "0x0048",
      "since"   : "1.26",
+     "output-compat" : "yes",
      "output"  : [ { "common-ref" : "Physical Slot Status",
                      "since"      : "1.26" },
                    { "common-ref" : "Physical Slot Information",
                      "since"      : "1.26" },
-                   { "common-ref" : "Slot EID Information",
-                     "since"      : "1.26" } ] }
+                   { "common-ref" : "Slot EID",
+                     "since"      : "1.32" } ] },
+
+  // *********************************************************************************
+  {  "name"    : "Remote Unlock",
+     "type"    : "Message",
+     "service" : "UIM",
+     "id"      : "0x005D",
+     "since"   : "1.32",
+     "input"   : [ { "name"               : "SimLock Data",
+                     "id"                 : "0x10",
+                     "type"               : "TLV",
+                     "since"              : "1.32",
+                     "format"             : "array",
+                     "size-prefix-format" : "guint16",
+                     "array-element"      : { "format" : "guint8" },
+                     "personal-info"      : "true" },
+                   { "name"               : "SimLock Extended Data",
+                     "id"                 : "0x12",
+                     "type"               : "TLV",
+                     "since"              : "1.32",
+                     "format"             : "array",
+                     "size-prefix-format" : "guint16",
+                     "array-element"      : { "format" : "guint8" },
+                     "personal-info"      : "true" } ],
+     "output"  : [ { "common-ref" : "Operation Result" } ] }
 
 ]
diff --git a/data/qmi-service-wda.json b/data/qmi-service-wda.json
index 31deb18..4b67e54 100644
--- a/data/qmi-service-wda.json
+++ b/data/qmi-service-wda.json
@@ -83,7 +83,17 @@ 
                                        "format"        : "guint32",
                                        "public-format" : "QmiDataEndpointType"},
                                      { "name"          : "Interface Number",
-                                       "format"        : "guint32"}] }],
+                                       "format"        : "guint32"}] },
+                   { "name"          : "Uplink Data Aggregation Max Datagrams",
+                     "id"            : "0x1B",
+                     "type"          : "TLV",
+                     "since"         : "1.32",
+                     "format"        : "guint32" },
+                   { "name"          : "Uplink Data Aggregation Max Size",
+                     "id"            : "0x1C",
+                     "type"          : "TLV",
+                     "since"         : "1.32",
+                     "format"        : "guint32" }],
      "output"  : [ { "common-ref" : "Operation Result" },
                    { "name"          : "QoS Format",
                      "id"            : "0x10",
diff --git a/data/qmi-service-wds.json b/data/qmi-service-wds.json
index 68042d3..84c509a 100644
--- a/data/qmi-service-wds.json
+++ b/data/qmi-service-wds.json
@@ -24,10 +24,10 @@ 
      "type"          : "TLV",
      "format"        : "guint16",
      "public-format" : "QmiWdsDsProfileError",
-     "prerequisites" : [ { "field"     : "Result.Error Status",
+     "prerequisites" : [ { "field"     : "Result Error Status",
                            "operation" : "!=",
                            "value"     : "QMI_STATUS_SUCCESS" },
-                         { "field"     : "Result.Error Code",
+                         { "field"     : "Result Error Code",
                            "operation" : "==",
                            "value"     : "QMI_PROTOCOL_ERROR_EXTENDED_INTERNAL" } ] },
 
@@ -195,13 +195,15 @@ 
       "name"       : "Username",
       "id"         : "0x1B",
       "type"       : "TLV",
-      "format"     : "string" },
+      "format"     : "string",
+      "personal-info" : "true" },
 
     { "common-ref" : "WDS Password",
       "name"       : "Password",
       "id"         : "0x1C",
       "type"       : "TLV",
-      "format"     : "string" },
+      "format"     : "string",
+      "personal-info" : "true" },
 
     { "common-ref" : "WDS Authentication",
       "name"       : "Authentication",
@@ -347,7 +349,8 @@ 
       "type"          : "TLV",
       "format"        : "array",
       "fixed-size"    : "8",
-      "array-element" : { "format": "guint16", "endian": "network" } },
+      "array-element" : { "format" : "guint16",
+                          "endian" : "network" } },
 
     { "common-ref"    : "WDS IPv6 Secondary DNS Address Preference",
       "name"          : "IPv6 Secondary DNS Address Preference",
@@ -355,7 +358,8 @@ 
       "type"          : "TLV",
       "format"        : "array",
       "fixed-size"    : "8",
-      "array-element" : { "format": "guint16", "endian": "network" } },
+      "array-element" : { "format" : "guint16",
+                          "endian" : "network" } },
 
     { "common-ref" : "WDS LTE QoS Parameters",
       "name"       : "LTE QoS Parameters",
@@ -663,10 +667,10 @@ 
                       "type"      : "TLV",
                       "since"     : "1.18",
                       "format"    : "sequence",
-                      "contents"  : [ { "name"          : "PDN Filter Handler",
-                                        "format"        : "array",
+                      "contents"  : [ { "name"               : "PDN Filter Handler",
+                                        "format"             : "array",
                                         "size-prefix-format" : "guint8",
-                                        "array-element" : { "format": "guint32" } } ] },
+                                        "array-element"      : { "format": "guint32" } } ] },
                     { "name"      : "Extended Data Bearer Technology",
                       "id"        : "0x2A",
                       "type"      : "TLV",
@@ -712,6 +716,28 @@ 
                       "format"    : "guint16" } ],
      "output"  : [  { "common-ref" : "Operation Result" } ] },
 
+  // *********************************************************************************
+  {  "name"    : "Indication Register",
+     "type"    : "Message",
+     "service" : "WDS",
+     "id"      : "0x0003",
+     "since"   : "1.32",
+     "input"   : [  { "name"          : "Report Extended IP Configuration Change",
+                      "id"            : "0x12",
+                      "mandatory"     : "no",
+                      "type"          : "TLV",
+                      "since"         : "1.32",
+                      "format"        : "guint8",
+                      "public-format" : "gboolean" },
+                    { "name"          : "Report Profile Changes",
+                      "id"            : "0x19",
+                      "mandatory"     : "no",
+                      "type"          : "TLV",
+                      "since"         : "1.34",
+                      "format"        : "guint8",
+                      "public-format" : "gboolean" } ],
+     "output"  : [  { "common-ref"    : "Operation Result" } ] },
+
   // *********************************************************************************
   {  "name"    : "Get Supported Messages",
      "type"    : "Message",
@@ -776,12 +802,14 @@ 
                       "id"        : "0x17",
                       "type"      : "TLV",
                       "since"     : "1.0",
-                      "format"    : "string" },
+                      "format"    : "string",
+                      "personal-info" : "true" },
                     { "name"      : "Password",
                       "id"        : "0x18",
                       "type"      : "TLV",
                       "since"     : "1.0",
-                      "format"    : "string" },
+                      "format"    : "string",
+                      "personal-info" : "true" },
                     { "name"          : "IP Family Preference",
                       "id"            : "0x19",
                       "type"          : "TLV",
@@ -837,10 +865,10 @@ 
                       "since"         : "1.0",
                       "format"        : "guint16",
                       "public-format" : "QmiWdsCallEndReason",
-                      "prerequisites" : [ { "field"     : "Result.Error Status",
+                      "prerequisites" : [ { "field"     : "Result Error Status",
                                             "operation" : "!=",
                                             "value"     : "QMI_STATUS_SUCCESS" },
-                                          { "field"     : "Result.Error Code",
+                                          { "field"     : "Result Error Code",
                                             "operation" : "==",
                                             "value"     : "QMI_PROTOCOL_ERROR_CALL_FAILED" } ] },
                     { "name"      : "Verbose Call End Reason",
@@ -853,10 +881,10 @@ 
                                         "public-format" : "QmiWdsVerboseCallEndReasonType" },
                                       { "name"   : "Reason",
                                         "format" : "gint16" } ],
-                      "prerequisites": [ { "field"     : "Result.Error Status",
+                      "prerequisites": [ { "field"     : "Result Error Status",
                                            "operation" : "!=",
                                            "value"     : "QMI_STATUS_SUCCESS" },
-                                         { "field"     : "Result.Error Code",
+                                         { "field"     : "Result Error Code",
                                            "operation" : "==",
                                            "value"     : "QMI_PROTOCOL_ERROR_CALL_FAILED" } ] } ] },
 
@@ -1307,20 +1335,21 @@ 
                      "format"        : "guint8",
                      "public-format" : "QmiWdsProfileType" } ],
      "output"  : [ { "common-ref" : "Operation Result" },
-                   { "name"          : "Profile List",
-                     "id"            : "0x01",
-                     "type"          : "TLV",
-                     "since"         : "1.8",
-                     "format"        : "array",
-                     "array-element" : { "name"     : "Profile",
-                                         "format"   : "struct",
-                                         "contents" : [ { "name"          : "Profile Type",
-                                                          "format"        : "guint8",
-                                                          "public-format" : "QmiWdsProfileType" },
-                                                        { "name"   : "Profile Index",
-                                                          "format" : "guint8" },
-                                                        { "name"   : "Profile Name",
-                                                          "format" : "string" } ] },
+                   { "name"               : "Profile List",
+                     "id"                 : "0x01",
+                     "type"               : "TLV",
+                     "since"              : "1.8",
+                     "format"             : "array",
+                     "size-prefix-format" : "guint8",
+                     "array-element"      : { "name"     : "Profile",
+                                              "format"   : "struct",
+                                              "contents" : [ { "name"          : "Profile Type",
+                                                               "format"        : "guint8",
+                                                               "public-format" : "QmiWdsProfileType" },
+                                                             { "name"   : "Profile Index",
+                                                               "format" : "guint8" },
+                                                             { "name"   : "Profile Name",
+                                                               "format" : "string" } ] },
                      "prerequisites" : [ { "common-ref" : "Success" } ] },
                    { "common-ref" : "WDS Extended Error Code",
                      "since"      : "1.8" } ] },
@@ -1613,7 +1642,7 @@ 
                       "type"          : "TLV",
                       "since"         : "1.0",
                       "format"        : "guint32",
-                      "public-format" : "QmiWdsGetCurrentSettingsRequestedSettings" } ],
+                      "public-format" : "QmiWdsRequestedSettings" } ],
      "output"  : [  { "common-ref" : "Operation Result" },
                     { "common-ref"    : "WDS Profile Name",
                       "since"         : "1.0",
@@ -1725,24 +1754,26 @@ 
                       "since"     : "1.0",
                       "format"    : "guint8",
                       "prerequisites" : [ { "common-ref" : "Success" } ] },
-                    { "name"      : "PCSCF Server Address List",
-                      "id"        : "0x23",
-                      "type"      : "TLV",
-                      "since"     : "1.0",
-                      "format"        : "array",
-                      "array-element" : { "name"     : "IPv4 Address",
-                                          "endian"   : "little",
-                                          "format"   : "guint32" },
-                      "prerequisites" : [ { "common-ref" : "Success" } ] },
-                    { "name"      : "PCSCF Domain Name List",
-                      "id"        : "0x24",
-                      "type"      : "TLV",
-                      "since"     : "1.0",
-                      "format"        : "array",
-                      "array-element" : { "name"               : "FQDN",
-                                          "format"             : "string",
-                                          "size-prefix-format" : "guint16" },
-                      "prerequisites" : [ { "common-ref" : "Success" } ] },
+                    { "name"               : "PCSCF Server Address List",
+                      "id"                 : "0x23",
+                      "type"               : "TLV",
+                      "since"              : "1.0",
+                      "format"             : "array",
+                      "size-prefix-format" : "guint8",
+                      "array-element"      : { "name"     : "IPv4 Address",
+                                               "endian"   : "little",
+                                               "format"   : "guint32" },
+                      "prerequisites"      : [ { "common-ref" : "Success" } ] },
+                    { "name"               : "PCSCF Domain Name List",
+                      "id"                 : "0x24",
+                      "type"               : "TLV",
+                      "since"              : "1.0",
+                      "format"             : "array",
+                      "size-prefix-format" : "guint8",
+                      "array-element"      : { "name"               : "FQDN",
+                                               "format"             : "string",
+                                               "size-prefix-format" : "guint16" },
+                      "prerequisites"      : [ { "common-ref" : "Success" } ] },
                     { "name"      : "IPv6 Address",
                       "id"        : "0x25",
                       "type"      : "TLV",
@@ -1767,20 +1798,20 @@ 
                                       { "name"       : "Prefix Length",
                                         "format"     : "guint8" } ],
                       "prerequisites" : [ { "common-ref" : "Success" } ] },
-                    { "name"      : "IPv6 Primary DNS Address",
-                      "id"        : "0x27",
-                      "type"      : "TLV",
-                      "since"     : "1.0",
-                      "format"    : "array",
-                      "fixed-size": "8",
+                    { "name"          : "IPv6 Primary DNS Address",
+                      "id"            : "0x27",
+                      "type"          : "TLV",
+                      "since"         : "1.0",
+                      "format"        : "array",
+                      "fixed-size"    : "8",
                       "array-element" : { "format": "guint16", "endian": "network" },
                       "prerequisites" : [ { "common-ref" : "Success" } ] },
-                    { "name"      : "IPv6 Secondary DNS Address",
-                      "id"        : "0x28",
-                      "type"      : "TLV",
-                      "since"     : "1.0",
-                      "format"    : "array",
-                      "fixed-size": "8",
+                    { "name"          : "IPv6 Secondary DNS Address",
+                      "id"            : "0x28",
+                      "type"          : "TLV",
+                      "since"         : "1.0",
+                      "format"        : "array",
+                      "fixed-size"    : "8",
                       "array-element" : { "format": "guint16", "endian": "network" },
                       "prerequisites" : [ { "common-ref" : "Success" } ] },
                     { "name"      : "MTU",
@@ -1789,15 +1820,16 @@ 
                       "since"     : "1.0",
                       "format"    : "guint32",
                       "prerequisites" : [ { "common-ref" : "Success" } ] },
-                    { "name"      : "Domain Name List",
-                      "id"        : "0x2A",
-                      "type"      : "TLV",
-                      "since"     : "1.0",
-                      "format"        : "array",
-                      "array-element" : { "name"               : "Domain Name",
-                                          "format"             : "string",
-                                          "size-prefix-format" : "guint16" },
-                      "prerequisites" : [ { "common-ref" : "Success" } ] },
+                    { "name"               : "Domain Name List",
+                      "id"                 : "0x2A",
+                      "type"               : "TLV",
+                      "since"              : "1.0",
+                      "format"             : "array",
+                      "size-prefix-format" : "guint8",
+                      "array-element"      : { "name"               : "Domain Name",
+                                               "format"             : "string",
+                                               "size-prefix-format" : "guint16" },
+                      "prerequisites"      : [ { "common-ref" : "Success" } ] },
                     { "name"      : "IP Family",
                       "id"        : "0x2B",
                       "type"      : "TLV",
@@ -1819,6 +1851,25 @@ 
                       // guint16 with equivalent positive enum values.
                       "format"    : "guint16",
                       "public-format" : "QmiWdsExtendedTechnologyPreference",
+                      "prerequisites" : [ { "common-ref" : "Success" } ] },
+                    { "name"      : "Operator Reserved PCO",
+                      "id"        : "0x2F",
+                      "type"      : "TLV",
+                      "since"     : "1.32",
+                      "format"    : "sequence",
+                      "contents"  : [ { "name"          : "MCC",
+                                        "format"        : "guint16"},
+                                      { "name"          : "MNC",
+                                        "format"        : "guint16" },
+                                      { "name"          : "MNC Includes PCS Digit",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"               : "App Specific Info",
+                                        "format"             : "array",
+                                        "size-prefix-format" : "guint8",
+                                        "array-element"      : { "format" : "guint8" } },
+                                      { "name"          : "Container Id",
+                                        "format"        : "guint16" } ],
                       "prerequisites" : [ { "common-ref" : "Success" } ] } ] },
 
   // *********************************************************************************
@@ -1878,10 +1929,10 @@ 
                       "since"         : "1.0",
                       "format"        : "gint8",
                       "public-format" : "QmiWdsDataBearerTechnology",
-                      "prerequisites" : [ { "field"     : "Result.Error Status",
+                      "prerequisites" : [ { "field"     : "Result Error Status",
                                            "operation" : "!=",
                                            "value"     : "QMI_STATUS_SUCCESS" },
-                                         { "field"     : "Result.Error Code",
+                                         { "field"     : "Result Error Code",
                                            "operation" : "==",
                                            "value"     : "QMI_PROTOCOL_ERROR_OUT_OF_CALL" } ] } ] },
 
@@ -2018,26 +2069,27 @@ 
                      "format"        : "guint8",
                      "public-format" : "QmiWdsDataSystemNetworkType" } ],
      "output"  : [ { "common-ref"   : "Operation Result" },
-                   { "name"          : "Info",
-                     "id"            : "0x10",
-                     "type"          : "TLV",
-                     "since"         : "1.14",
-                     "format"        : "array",
-                     "array-element" : { "name"     : "Element",
-                                         "format"   : "struct",
-                                         "contents" : [ { "name"          : "IPv4 Throttled",
-                                                          "format"        : "gint8",
-                                                          "public-format" : "gboolean" },
-                                                        { "name"          : "IPv6 Throttled",
-                                                          "format"        : "gint8",
-                                                          "public-format" : "gboolean" },
-                                                        { "name"          : "IPv4 Throttle Time Left MS",
-                                                          "format"        : "guint32" },
-                                                        { "name"          : "IPv6 Throttle Time Left MS",
-                                                          "format"        : "guint32" },
-                                                        { "name"          : "APN",
-                                                          "format"        : "string" } ] },
-                     "prerequisites": [ { "common-ref" : "Success" } ] } ] },
+                   { "name"               : "Info",
+                     "id"                 : "0x10",
+                     "type"               : "TLV",
+                     "since"              : "1.14",
+                     "format"             : "array",
+                     "size-prefix-format" : "guint8",
+                     "array-element"      : { "name"     : "Element",
+                                              "format"   : "struct",
+                                              "contents" : [ { "name"          : "IPv4 Throttled",
+                                                               "format"        : "gint8",
+                                                               "public-format" : "gboolean" },
+                                                             { "name"          : "IPv6 Throttled",
+                                                               "format"        : "gint8",
+                                                               "public-format" : "gboolean" },
+                                                             { "name"          : "IPv4 Throttle Time Left MS",
+                                                               "format"        : "guint32" },
+                                                             { "name"          : "IPv6 Throttle Time Left MS",
+                                                               "format"        : "guint32" },
+                                                             { "name"          : "APN",
+                                                               "format"        : "string" } ] },
+                     "prerequisites"      : [ { "common-ref" : "Success" } ] } ] },
 
   // *********************************************************************************
   {  "name"    : "Get LTE Attach Parameters",
@@ -2081,6 +2133,19 @@ 
                      "public-format" : "QmiSioPort" } ],
      "output"  : [ { "common-ref" : "Operation Result" } ] },
 
+  // *********************************************************************************
+  {   "name"    : "Extended Ip Config",
+      "type"    : "Indication",
+      "service" : "WDS",
+      "id"      : "0x008C",
+      "since"   : "1.32",
+      "output"  : [ { "name"          : "Changed IP Configuration",
+                      "id"            : "0x10",
+                      "type"          : "TLV",
+                      "since"         : "1.32",
+                      "format"        : "guint32",
+                      "public-format" : "QmiWdsRequestedSettings" } ] },
+
   // *********************************************************************************
   {  "name"    : "Get Max LTE Attach PDN Number",
      "type"    : "Message",
@@ -2101,13 +2166,14 @@ 
       "service" : "WDS",
       "id"      : "0x0093",
       "since"   : "1.28",
-      "input"   : [ { "name"          : "List",
-                      "id"            : "0x01",
-                      "type"          : "TLV",
-                      "since"         : "1.28",
-                      "format"        : "array",
-                      "array-element" : { "name"     : "PDN Profile ID",
-                                          "format"   : "guint16" }},
+      "input"   : [ { "name"               : "List",
+                      "id"                 : "0x01",
+                      "type"               : "TLV",
+                      "since"              : "1.28",
+                      "format"             : "array",
+                      "size-prefix-format" : "guint8",
+                      "array-element"      : { "name"     : "PDN Profile ID",
+                                               "format"   : "guint16" }},
                     { "name"          : "Action",
                       "id"            : "0x10",
                       "type"          : "TLV",
@@ -2122,14 +2188,12 @@ 
       "service" : "WDS",
       "id"      : "0x0093",
       "since"   : "1.28",
-      "output"  : [ { "common-ref"   : "Operation Result" },
-                    { "name"          : "Action Result",
+      "output"  : [ { "name"          : "Action Result",
                       "id"            : "0x01",
                       "type"          : "TLV",
                       "since"         : "1.28",
                       "format"        : "guint8",
-                      "public-format" : "gboolean",
-                      "prerequisites" : [ { "common-ref" : "Success" } ] } ] },
+                      "public-format" : "gboolean" } ] },
 
   // *********************************************************************************
   {  "name"    : "Get LTE Attach PDN List",
@@ -2138,22 +2202,24 @@ 
      "id"      : "0x0094",
      "since"   : "1.28",
      "output"  : [ { "common-ref"   : "Operation Result" },
-                   { "name"          : "Current List",
-                     "id"            : "0x10",
-                     "type"          : "TLV",
-                     "since"         : "1.28",
-                     "format"        : "array",
-                     "array-element" : { "name"     : "PDN Profile ID",
-                                         "format"   : "guint16" },
+                   { "name"               : "Current List",
+                     "id"                 : "0x10",
+                     "type"               : "TLV",
+                     "since"              : "1.28",
+                     "format"             : "array",
+                     "size-prefix-format" : "guint8",
+                     "array-element"      : { "name"     : "PDN Profile ID",
+                                              "format"   : "guint16" },
                      "prerequisites" : [ { "common-ref" : "Success" } ] },
-                   { "name"          : "Pending List",
-                     "id"            : "0x11",
-                     "type"          : "TLV",
-                     "since"         : "1.28",
-                     "format"        : "array",
-                     "array-element" : { "name"     : "PDN Profile ID",
-                                         "format"   : "guint16" },
-                     "prerequisites" : [ { "common-ref" : "Success" } ] } ] },
+                   { "name"               : "Pending List",
+                     "id"                 : "0x11",
+                     "type"               : "TLV",
+                     "since"              : "1.28",
+                     "format"             : "array",
+                     "size-prefix-format" : "guint8",
+                     "array-element"      : { "name"     : "PDN Profile ID",
+                                              "format"   : "guint16" },
+                     "prerequisites"      : [ { "common-ref" : "Success" } ] } ] },
 
 // *********************************************************************************
     {   "name"    : "Bind Mux Data Port",
@@ -2185,6 +2251,47 @@ 
                       ],
         "output"  : [ { "common-ref" : "Operation Result" } ] },
 
+// *********************************************************************************
+    {   "name"    : "Configure Profile Event List",
+        "type"    : "Message",
+        "service" : "WDS",
+        "id"      : "0x00A7",
+        "since"   : "1.34",
+        "input"   : [ { "name"               : "Register",
+                        "id"                 : "0x10",
+                        "type"               : "TLV",
+                        "since"              : "1.34",
+                        "format"             : "array",
+                        "size-prefix-format" : "guint8",
+                        "array-element"      : { "name"     : "Element",
+                                                 "format"   : "struct",
+                                                 "contents" : [ { "name"          : "Profile Type",
+                                                                  "format"        : "guint8",
+                                                                  "public-format" : "QmiWdsProfileType" },
+                                                                { "name"          : "Profile Index",
+                                                                  "format"        : "guint8" } ] } } ],
+        "output"  : [ { "common-ref" : "Operation Result" } ] },
+
+// *********************************************************************************
+    {   "name"    : "Profile Changed",
+        "type"    : "Indication",
+        "service" : "WDS",
+        "id"      : "0x00A8",
+        "since"   : "1.34",
+        "output"  : [ { "name"          : "Profile Event",
+                        "id"            : "0x10",
+                        "type"          : "TLV",
+                        "since"         : "1.34",
+                        "format"        : "sequence",
+                        "contents"      : [ { "name"          : "Profile Type",
+                                              "format"        : "guint8",
+                                              "public-format" : "QmiWdsProfileType" },
+                                            { "name"          : "Profile Index",
+                                              "format"        : "guint8" },
+                                            { "name"          : "Change Event",
+                                              "format"        : "guint8",
+                                              "public-format" : "QmiWdsProfileChangeEvent" } ] } ] },
+
 // *********************************************************************************
 {  "name"    : "Swi Create Profile Indexed",
    "type"    : "Message",
diff --git a/data/qmi-service-wms.json b/data/qmi-service-wms.json
index ea23cf7..3af6d0d 100644
--- a/data/qmi-service-wms.json
+++ b/data/qmi-service-wms.json
@@ -72,7 +72,8 @@ 
                                      { "name"               : "Raw Data",
                                        "format"             : "array",
                                        "size-prefix-format" : "guint16",
-                                       "array-element"      : { "format" : "guint8" } } ] },
+                                       "array-element"      : { "format" : "guint8" },
+                                       "personal-info"      : "true" } ] },
                    { "name"          : "Message Mode",
                      "id"            : "0x12",
                      "type"          : "TLV",
@@ -90,7 +91,8 @@ 
                                      { "name"               : "Raw Data",
                                        "format"             : "array",
                                        "size-prefix-format" : "guint16",
-                                       "array-element"      : { "format" : "guint8" } } ] },
+                                       "array-element"      : { "format" : "guint8" },
+                                       "personal-info"      : "true" } ] },
                    { "name"      : "ETWS PLMN Information",
                      "id"        : "0x14",
                      "type"      : "TLV",
@@ -145,7 +147,8 @@ 
                                      { "name"               : "Raw Data",
                                        "format"             : "array",
                                        "size-prefix-format" : "guint16",
-                                       "array-element"      : { "format" : "guint8" } } ] },
+                                       "array-element"      : { "format" : "guint8" },
+                                       "personal-info"      : "true" } ] },
                    { "name"      : "CDMA Force On DC",
                      "id"        : "0x10",
                      "type"      : "TLV",
@@ -190,10 +193,10 @@ 
                      "since"         : "1.0",
                      "format"        : "guint16",
                      "public-format" : "QmiWmsCdmaCauseCode",
-                     "prerequisites" : [ { "field"     : "Result.Error Status",
+                     "prerequisites" : [ { "field"     : "Result Error Status",
                                            "operation" : "!=",
                                            "value"     : "QMI_STATUS_SUCCESS" },
-                                         { "field"     : "Result.Error Code",
+                                         { "field"     : "Result Error Code",
                                            "operation" : "==",
                                            "value"     : "QMI_PROTOCOL_ERROR_WMS_CAUSE_CODE" } ] },
                    { "name"          : "CDMA Error Class",
@@ -202,10 +205,10 @@ 
                      "since"         : "1.0",
                      "format"        : "guint8",
                      "public-format" : "QmiWmsCdmaErrorClass",
-                     "prerequisites" : [ { "field"     : "Result.Error Status",
+                     "prerequisites" : [ { "field"     : "Result Error Status",
                                            "operation" : "!=",
                                            "value"     : "QMI_STATUS_SUCCESS" },
-                                         { "field"     : "Result.Error Code",
+                                         { "field"     : "Result Error Code",
                                            "operation" : "==",
                                            "value"     : "QMI_PROTOCOL_ERROR_WMS_CAUSE_CODE" } ] },
                    { "name"          : "GSM WCDMA Cause Info",
@@ -219,10 +222,10 @@ 
                                          { "name"          : "TP Cause",
                                            "format"        : "guint8",
                                            "public-format" : "QmiWmsGsmUmtsTpCause" } ],
-                     "prerequisites" : [ { "field"     : "Result.Error Status",
+                     "prerequisites" : [ { "field"     : "Result Error Status",
                                            "operation" : "!=",
                                            "value"     : "QMI_STATUS_SUCCESS" },
-                                         { "field"     : "Result.Error Code",
+                                         { "field"     : "Result Error Code",
                                            "operation" : "==",
                                            "value"     : "QMI_PROTOCOL_ERROR_WMS_CAUSE_CODE" } ] },
                    { "name"          : "Message Delivery Failure Type",
@@ -231,10 +234,10 @@ 
                      "since"         : "1.0",
                      "format"        : "guint8",
                      "public-format" : "QmiWmsMessageDeliveryFailureType",
-                     "prerequisites" : [ { "field"     : "Result.Error Status",
+                     "prerequisites" : [ { "field"     : "Result Error Status",
                                            "operation" : "!=",
                                            "value"     : "QMI_STATUS_SUCCESS" },
-                                         { "field"     : "Result.Error Code",
+                                         { "field"     : "Result Error Code",
                                            "operation" : "==",
                                            "value"     : "QMI_PROTOCOL_ERROR_WMS_CAUSE_CODE" } ] } ] },
 
@@ -258,7 +261,8 @@ 
                                      { "name"               : "Raw Data",
                                        "format"             : "array",
                                        "size-prefix-format" : "guint16",
-                                       "array-element"      : { "format" : "guint8" } } ] } ],
+                                       "array-element"      : { "format" : "guint8" },
+                                       "personal-info"      : "true" } ] } ],
      "output"  : [ { "common-ref" : "Operation Result" },
                    { "name"          : "Memory Index",
                      "id"            : "0x01",
@@ -310,7 +314,8 @@ 
                                       { "name"               : "Raw Data",
                                         "format"             : "array",
                                         "size-prefix-format" : "guint16",
-                                        "array-element"      : { "format" : "guint8" } } ],
+                                        "array-element"      : { "format" : "guint8" },
+                                        "personal-info"      : "true" } ],
                       "prerequisites" : [ { "common-ref" : "Success" } ] } ] },
 
   // *********************************************************************************
@@ -550,10 +555,10 @@ 
                      "since"         : "1.28",
                      "format"        : "guint8",
 		     "public-format" : "QmiWmsAckFailureCause",
-                     "prerequisites" : [ { "field"     : "Result.Error Status",
+                     "prerequisites" : [ { "field"     : "Result Error Status",
                                            "operation" : "!=",
                                            "value"     : "QMI_STATUS_SUCCESS" },
-                                         { "field"     : "Result.Error Code",
+                                         { "field"     : "Result Error Code",
                                            "operation" : "==",
                                            "value"     : "QMI_PROTOCOL_ERROR_ACK_NOT_SENT" } ] } ] },
 
@@ -595,10 +600,10 @@ 
                      "since"         : "1.0",
                      "format"        : "guint16",
                      "public-format" : "QmiWmsCdmaCauseCode",
-                     "prerequisites" : [ { "field"     : "Result.Error Status",
+                     "prerequisites" : [ { "field"     : "Result Error Status",
                                            "operation" : "!=",
                                            "value"     : "QMI_STATUS_SUCCESS" },
-                                         { "field"     : "Result.Error Code",
+                                         { "field"     : "Result Error Code",
                                            "operation" : "==",
                                            "value"     : "QMI_PROTOCOL_ERROR_WMS_CAUSE_CODE" } ] },
                    { "name"          : "CDMA Error Class",
@@ -607,10 +612,10 @@ 
                      "since"         : "1.0",
                      "format"        : "guint8",
                      "public-format" : "QmiWmsCdmaErrorClass",
-                     "prerequisites" : [ { "field"     : "Result.Error Status",
+                     "prerequisites" : [ { "field"     : "Result Error Status",
                                            "operation" : "!=",
                                            "value"     : "QMI_STATUS_SUCCESS" },
-                                         { "field"     : "Result.Error Code",
+                                         { "field"     : "Result Error Code",
                                            "operation" : "==",
                                            "value"     : "QMI_PROTOCOL_ERROR_WMS_CAUSE_CODE" } ] },
                    { "name"          : "GSM WCDMA Cause Info",
@@ -624,10 +629,10 @@ 
                                          { "name"          : "TP Cause",
                                            "format"        : "guint8",
                                            "public-format" : "QmiWmsGsmUmtsTpCause" } ],
-                     "prerequisites" : [ { "field"     : "Result.Error Status",
+                     "prerequisites" : [ { "field"     : "Result Error Status",
                                            "operation" : "!=",
                                            "value"     : "QMI_STATUS_SUCCESS" },
-                                         { "field"     : "Result.Error Code",
+                                         { "field"     : "Result Error Code",
                                            "operation" : "==",
                                            "value"     : "QMI_PROTOCOL_ERROR_WMS_CAUSE_CODE" } ] },
                    { "name"          : "Message Delivery Failure Type",
@@ -636,10 +641,10 @@ 
                      "since"         : "1.0",
                      "format"        : "guint8",
                      "public-format" : "QmiWmsMessageDeliveryFailureType",
-                     "prerequisites" : [ { "field"     : "Result.Error Status",
+                     "prerequisites" : [ { "field"     : "Result Error Status",
                                            "operation" : "!=",
                                            "value"     : "QMI_STATUS_SUCCESS" },
-                                         { "field"     : "Result.Error Code",
+                                         { "field"     : "Result Error Code",
                                            "operation" : "==",
                                            "value"     : "QMI_PROTOCOL_ERROR_WMS_CAUSE_CODE" } ] } ] },