diff --git a/firmware/target/hosted/sonynwz/nwz-db.c b/firmware/target/hosted/sonynwz/nwz-db.c
index c216fd3a78..96a6ac41d3 100644
--- a/firmware/target/hosted/sonynwz/nwz-db.c
+++ b/firmware/target/hosted/sonynwz/nwz-db.c
@@ -217,6 +217,131 @@ struct nwz_model_info_t nwz_model[NWZ_MODEL_COUNT] =
     { 0x24000006, "NW-A47" },
 };
 
+static int nvp_index_06a782[NWZ_NVP_COUNT] =
+{
+    [NWZ_NVP_APD] = NWZ_NVP_INVALID,
+    [NWZ_NVP_APP] = 0,
+    [NWZ_NVP_BFD] = NWZ_NVP_INVALID,
+    [NWZ_NVP_BFP] = NWZ_NVP_INVALID,
+    [NWZ_NVP_BLF] = NWZ_NVP_INVALID,
+    [NWZ_NVP_BML] = NWZ_NVP_INVALID,
+    [NWZ_NVP_BOK] = 10,
+    [NWZ_NVP_BPR] = 35,
+    [NWZ_NVP_BTC] = NWZ_NVP_INVALID,
+    [NWZ_NVP_BTI] = 1,
+    [NWZ_NVP_CLG] = NWZ_NVP_INVALID,
+    [NWZ_NVP_CLV] = 68,
+    [NWZ_NVP_CNG] = 3,
+    [NWZ_NVP_CTR] = NWZ_NVP_INVALID,
+    [NWZ_NVP_DBA] = 12,
+    [NWZ_NVP_DBG] = NWZ_NVP_INVALID,
+    [NWZ_NVP_DBI] = NWZ_NVP_INVALID,
+    [NWZ_NVP_DBS] = 27,
+    [NWZ_NVP_DBV] = 13,
+    [NWZ_NVP_DCC] = 7,
+    [NWZ_NVP_DG0] = 5,
+    [NWZ_NVP_DG1] = 6,
+    [NWZ_NVP_DOR] = 21,
+    [NWZ_NVP_E00] = 36,
+    [NWZ_NVP_E01] = 37,
+    [NWZ_NVP_E02] = 38,
+    [NWZ_NVP_E03] = 39,
+    [NWZ_NVP_E04] = 40,
+    [NWZ_NVP_E05] = 41,
+    [NWZ_NVP_E06] = 42,
+    [NWZ_NVP_E07] = 43,
+    [NWZ_NVP_E08] = 44,
+    [NWZ_NVP_E09] = 45,
+    [NWZ_NVP_E10] = 46,
+    [NWZ_NVP_E11] = 47,
+    [NWZ_NVP_E12] = 48,
+    [NWZ_NVP_E13] = 49,
+    [NWZ_NVP_E14] = 50,
+    [NWZ_NVP_E15] = 51,
+    [NWZ_NVP_E16] = 52,
+    [NWZ_NVP_E17] = 53,
+    [NWZ_NVP_E18] = 54,
+    [NWZ_NVP_E19] = 55,
+    [NWZ_NVP_E20] = 56,
+    [NWZ_NVP_E21] = 57,
+    [NWZ_NVP_E22] = 58,
+    [NWZ_NVP_E23] = 59,
+    [NWZ_NVP_E24] = 60,
+    [NWZ_NVP_E25] = 61,
+    [NWZ_NVP_E26] = 62,
+    [NWZ_NVP_E27] = 63,
+    [NWZ_NVP_E28] = 64,
+    [NWZ_NVP_E29] = 65,
+    [NWZ_NVP_E30] = 66,
+    [NWZ_NVP_E31] = 67,
+    [NWZ_NVP_EDW] = 22,
+    [NWZ_NVP_EP0] = NWZ_NVP_INVALID,
+    [NWZ_NVP_EP1] = NWZ_NVP_INVALID,
+    [NWZ_NVP_EP2] = NWZ_NVP_INVALID,
+    [NWZ_NVP_EP3] = NWZ_NVP_INVALID,
+    [NWZ_NVP_ERI] = NWZ_NVP_INVALID,
+    [NWZ_NVP_EXM] = NWZ_NVP_INVALID,
+    [NWZ_NVP_FMP] = NWZ_NVP_INVALID,
+    [NWZ_NVP_FNI] = NWZ_NVP_INVALID,
+    [NWZ_NVP_FPI] = NWZ_NVP_INVALID,
+    [NWZ_NVP_FUI] = 19,
+    [NWZ_NVP_FUP] = 9,
+    [NWZ_NVP_FUR] = NWZ_NVP_INVALID,
+    [NWZ_NVP_FVI] = NWZ_NVP_INVALID,
+    [NWZ_NVP_GTY] = 18,
+    [NWZ_NVP_HDI] = 2,
+    [NWZ_NVP_HLD] = NWZ_NVP_INVALID,
+    [NWZ_NVP_INS] = NWZ_NVP_INVALID,
+    [NWZ_NVP_IPT] = NWZ_NVP_INVALID,
+    [NWZ_NVP_KAS] = 32,
+    [NWZ_NVP_LBI] = 20,
+    [NWZ_NVP_LYR] = NWZ_NVP_INVALID,
+    [NWZ_NVP_MAC] = NWZ_NVP_INVALID,
+    [NWZ_NVP_MCR] = NWZ_NVP_INVALID,
+    [NWZ_NVP_MDK] = NWZ_NVP_INVALID,
+    [NWZ_NVP_MDL] = 8,
+    [NWZ_NVP_MID] = 16,
+    [NWZ_NVP_MLK] = NWZ_NVP_INVALID,
+    [NWZ_NVP_MSC] = NWZ_NVP_INVALID,
+    [NWZ_NVP_MSO] = NWZ_NVP_INVALID,
+    [NWZ_NVP_MTM] = NWZ_NVP_INVALID,
+    [NWZ_NVP_MUK] = NWZ_NVP_INVALID,
+    [NWZ_NVP_NCP] = 31,
+    [NWZ_NVP_NVR] = NWZ_NVP_INVALID,
+    [NWZ_NVP_PCD] = 26,
+    [NWZ_NVP_PCI] = NWZ_NVP_INVALID,
+    [NWZ_NVP_PNC] = 33,
+    [NWZ_NVP_PRK] = NWZ_NVP_INVALID,
+    [NWZ_NVP_PSK] = NWZ_NVP_INVALID,
+    [NWZ_NVP_PTS] = NWZ_NVP_INVALID,
+    [NWZ_NVP_PWD] = NWZ_NVP_INVALID,
+    [NWZ_NVP_RBT] = NWZ_NVP_INVALID,
+    [NWZ_NVP_RND] = 28,
+    [NWZ_NVP_RTC] = 34,
+    [NWZ_NVP_SDC] = NWZ_NVP_INVALID,
+    [NWZ_NVP_SDP] = 30,
+    [NWZ_NVP_SER] = 4,
+    [NWZ_NVP_SFI] = NWZ_NVP_INVALID,
+    [NWZ_NVP_SHE] = NWZ_NVP_INVALID,
+    [NWZ_NVP_SHP] = 11,
+    [NWZ_NVP_SID] = NWZ_NVP_INVALID,
+    [NWZ_NVP_SKD] = NWZ_NVP_INVALID,
+    [NWZ_NVP_SKT] = NWZ_NVP_INVALID,
+    [NWZ_NVP_SKU] = NWZ_NVP_INVALID,
+    [NWZ_NVP_SLP] = 69,
+    [NWZ_NVP_SPS] = NWZ_NVP_INVALID,
+    [NWZ_NVP_SYI] = 24,
+    [NWZ_NVP_TR0] = 14,
+    [NWZ_NVP_TR1] = 15,
+    [NWZ_NVP_TST] = 17,
+    [NWZ_NVP_UBP] = 23,
+    [NWZ_NVP_UFN] = 29,
+    [NWZ_NVP_UMS] = NWZ_NVP_INVALID,
+    [NWZ_NVP_UPS] = NWZ_NVP_INVALID,
+    [NWZ_NVP_VAR] = 25,
+    [NWZ_NVP_VRT] = NWZ_NVP_INVALID,
+};
+
 static int nvp_index_0ac81d[NWZ_NVP_COUNT] =
 {
     [NWZ_NVP_APD] = 78,
@@ -1597,10 +1722,10 @@ struct nwz_series_info_t nwz_series[NWZ_SERIES_COUNT] =
     { "nw-s10", "NW-S10 Series", 5, models_nw_s10, &nvp_index_6485c8 },
     { "nwz-s510", "NWZ-S510 Series", 2, models_nwz_s510, 0 },
     { "nwz-s610", "NWZ-S610 Series", 5, models_nwz_s610, 0 },
-    { "nwz-s630", "NWZ-S630 Series", 6, models_nwz_s630, 0 },
+    { "nwz-s630", "NWZ-S630 Series", 6, models_nwz_s630, &nvp_index_06a782 },
     { "nw-s640", "NW-S640 Series", 3, models_nw_s640, &nvp_index_0ac81d },
     { "nwz-s710", "NWZ-S710 Series", 6, models_nwz_s710, 0 },
-    { "nwz-s730", "NWZ-S730 Series", 6, models_nwz_s730, 0 },
+    { "nwz-s730", "NWZ-S730 Series", 6, models_nwz_s730, &nvp_index_06a782 },
     { "nwz-s740", "NWZ-S740 Series", 6, models_nwz_s740, &nvp_index_0ac81d },
     { "nwz-s750", "NWZ-S750 Series", 5, models_nwz_s750, &nvp_index_0ac81d },
     { "nwz-s760", "NWZ-S760 Series", 10, models_nwz_s760, &nvp_index_f505c8 },
diff --git a/utils/nwztools/database/nvp/nwz-s630.txt b/utils/nwztools/database/nvp/nwz-s630.txt
new file mode 100644
index 0000000000..8e6ca35a4a
--- /dev/null
+++ b/utils/nwztools/database/nvp/nwz-s630.txt
@@ -0,0 +1,70 @@
+app,0
+bti,1
+hdi,2
+cng,3
+ser,4
+dg0,5
+dg1,6
+dcc,7
+mdl,8
+fup,9
+bok,10
+shp,11
+dba,12
+dbv,13
+tr0,14
+tr1,15
+mid,16
+tst,17
+gty,18
+fui,19
+lbi,20
+dor,21
+edw,22
+ubp,23
+syi,24
+var,25
+pcd,26
+dbs,27
+rnd,28
+ufn,29
+sdp,30
+ncp,31
+kas,32
+pnc,33
+rtc,34
+bpr,35
+e00,36
+e01,37
+e02,38
+e03,39
+e04,40
+e05,41
+e06,42
+e07,43
+e08,44
+e09,45
+e10,46
+e11,47
+e12,48
+e13,49
+e14,50
+e15,51
+e16,52
+e17,53
+e18,54
+e19,55
+e20,56
+e21,57
+e22,58
+e23,59
+e24,60
+e25,61
+e26,62
+e27,63
+e28,64
+e29,65
+e30,66
+e31,67
+clv,68
+slp,69
diff --git a/utils/nwztools/database/nvp/nwz-s730.txt b/utils/nwztools/database/nvp/nwz-s730.txt
new file mode 100644
index 0000000000..8e6ca35a4a
--- /dev/null
+++ b/utils/nwztools/database/nvp/nwz-s730.txt
@@ -0,0 +1,70 @@
+app,0
+bti,1
+hdi,2
+cng,3
+ser,4
+dg0,5
+dg1,6
+dcc,7
+mdl,8
+fup,9
+bok,10
+shp,11
+dba,12
+dbv,13
+tr0,14
+tr1,15
+mid,16
+tst,17
+gty,18
+fui,19
+lbi,20
+dor,21
+edw,22
+ubp,23
+syi,24
+var,25
+pcd,26
+dbs,27
+rnd,28
+ufn,29
+sdp,30
+ncp,31
+kas,32
+pnc,33
+rtc,34
+bpr,35
+e00,36
+e01,37
+e02,38
+e03,39
+e04,40
+e05,41
+e06,42
+e07,43
+e08,44
+e09,45
+e10,46
+e11,47
+e12,48
+e13,49
+e14,50
+e15,51
+e16,52
+e17,53
+e18,54
+e19,55
+e20,56
+e21,57
+e22,58
+e23,59
+e24,60
+e25,61
+e26,62
+e27,63
+e28,64
+e29,65
+e30,66
+e31,67
+clv,68
+slp,69