diff --git a/machines/atlas/facter.json b/machines/atlas/facter.json
index 200d9bd..03da58b 100644
--- a/machines/atlas/facter.json
+++ b/machines/atlas/facter.json
@@ -23,9 +23,14 @@
     },
     "bluetooth": [
       {
-        "index": 45,
-        "attached_to": 46,
+        "index": 27,
+        "attached_to": 28,
+        "class_list": [
+          "usb",
+          "bluetooth"
+        ],
         "bus_type": {
+          "hex": "0086",
           "name": "USB",
           "value": 134
         },
@@ -34,16 +39,20 @@
           "number": 0
         },
         "base_class": {
+          "hex": "0115",
           "name": "Bluetooth Device",
           "value": 277
         },
         "vendor": {
+          "hex": "8087",
           "value": 32903
         },
         "device": {
+          "hex": "0aa7",
           "value": 2727
         },
         "revision": {
+          "hex": "0000",
           "name": "0.01",
           "value": 0
         },
@@ -62,19 +71,23 @@
         ],
         "detail": {
           "device_class": {
+            "hex": "00e0",
             "name": "wireless",
             "value": 224
           },
           "device_subclass": {
+            "hex": "0001",
             "name": "audio",
             "value": 1
           },
           "device_protocol": 1,
           "interface_class": {
+            "hex": "00e0",
             "name": "wireless",
             "value": 224
           },
           "interface_subclass": {
+            "hex": "0001",
             "name": "audio",
             "value": 1
           },
@@ -94,9 +107,14 @@
         "module_alias": "usb:v8087p0AA7d0001dcE0dsc01dp01icE0isc01ip01in00"
       },
       {
-        "index": 47,
-        "attached_to": 46,
+        "index": 29,
+        "attached_to": 28,
+        "class_list": [
+          "usb",
+          "bluetooth"
+        ],
         "bus_type": {
+          "hex": "0086",
           "name": "USB",
           "value": 134
         },
@@ -105,16 +123,20 @@
           "number": 0
         },
         "base_class": {
+          "hex": "0115",
           "name": "Bluetooth Device",
           "value": 277
         },
         "vendor": {
+          "hex": "8087",
           "value": 32903
         },
         "device": {
+          "hex": "0aa7",
           "value": 2727
         },
         "revision": {
+          "hex": "0000",
           "name": "0.01",
           "value": 0
         },
@@ -133,19 +155,23 @@
         ],
         "detail": {
           "device_class": {
+            "hex": "00e0",
             "name": "wireless",
             "value": 224
           },
           "device_subclass": {
+            "hex": "0001",
             "name": "audio",
             "value": 1
           },
           "device_protocol": 1,
           "interface_class": {
+            "hex": "00e0",
             "name": "wireless",
             "value": 224
           },
           "interface_subclass": {
+            "hex": "0001",
             "name": "audio",
             "value": 1
           },
@@ -169,7 +195,12 @@
       {
         "index": 10,
         "attached_to": 0,
+        "class_list": [
+          "pci",
+          "bridge"
+        ],
         "bus_type": {
+          "hex": "0004",
           "name": "PCI",
           "value": 4
         },
@@ -178,27 +209,34 @@
           "number": 31
         },
         "base_class": {
+          "hex": "0006",
           "name": "Bridge",
           "value": 6
         },
         "sub_class": {
+          "hex": "0001",
           "name": "ISA bridge",
           "value": 1
         },
         "vendor": {
+          "hex": "8086",
           "name": "Intel Corporation",
           "value": 32902
         },
         "sub_vendor": {
+          "hex": "1458",
           "value": 5208
         },
         "device": {
+          "hex": "31e8",
           "value": 12776
         },
         "sub_device": {
+          "hex": "1000",
           "value": 4096
         },
         "revision": {
+          "hex": "0003",
           "value": 3
         },
         "model": "Intel ISA bridge",
@@ -212,13 +250,26 @@
           "irq": 0,
           "prog_if": 0
         },
+        "driver": "lpc_ich",
+        "driver_module": "lpc_ich",
+        "drivers": [
+          "lpc_ich"
+        ],
+        "driver_modules": [
+          "lpc_ich"
+        ],
         "module_alias": "pci:v00008086d000031E8sv00001458sd00001000bc06sc01i00",
         "label": "Onboard - Other"
       },
       {
         "index": 11,
         "attached_to": 0,
+        "class_list": [
+          "pci",
+          "bridge"
+        ],
         "bus_type": {
+          "hex": "0004",
           "name": "PCI",
           "value": 4
         },
@@ -227,31 +278,39 @@
           "number": 19
         },
         "base_class": {
+          "hex": "0006",
           "name": "Bridge",
           "value": 6
         },
         "sub_class": {
+          "hex": "0004",
           "name": "PCI bridge",
           "value": 4
         },
         "pci_interface": {
+          "hex": "0000",
           "name": "Normal decode",
           "value": 0
         },
         "vendor": {
+          "hex": "8086",
           "name": "Intel Corporation",
           "value": 32902
         },
         "sub_vendor": {
+          "hex": "1458",
           "value": 5208
         },
         "device": {
+          "hex": "31da",
           "value": 12762
         },
         "sub_device": {
+          "hex": "1000",
           "value": 4096
         },
         "revision": {
+          "hex": "00f3",
           "value": 243
         },
         "model": "Intel PCI bridge",
@@ -260,7 +319,7 @@
         "resources": [
           {
             "type": "irq",
-            "base": 123,
+            "base": 121,
             "triggered": 0,
             "enabled": true
           }
@@ -270,19 +329,28 @@
           "command": 1031,
           "header_type": 1,
           "secondary_bus": 2,
-          "irq": 123,
+          "irq": 121,
           "prog_if": 0
         },
         "driver": "pcieport",
+        "driver_module": "pcieportdrv",
         "drivers": [
           "pcieport"
         ],
+        "driver_modules": [
+          "pcieportdrv"
+        ],
         "module_alias": "pci:v00008086d000031DAsv00001458sd00001000bc06sc04i00"
       },
       {
         "index": 13,
         "attached_to": 0,
+        "class_list": [
+          "pci",
+          "bridge"
+        ],
         "bus_type": {
+          "hex": "0004",
           "name": "PCI",
           "value": 4
         },
@@ -291,31 +359,39 @@
           "number": 19
         },
         "base_class": {
+          "hex": "0006",
           "name": "Bridge",
           "value": 6
         },
         "sub_class": {
+          "hex": "0004",
           "name": "PCI bridge",
           "value": 4
         },
         "pci_interface": {
+          "hex": "0000",
           "name": "Normal decode",
           "value": 0
         },
         "vendor": {
+          "hex": "8086",
           "name": "Intel Corporation",
           "value": 32902
         },
         "sub_vendor": {
+          "hex": "1458",
           "value": 5208
         },
         "device": {
+          "hex": "31d8",
           "value": 12760
         },
         "sub_device": {
+          "hex": "1000",
           "value": 4096
         },
         "revision": {
+          "hex": "00f3",
           "value": 243
         },
         "model": "Intel PCI bridge",
@@ -324,7 +400,7 @@
         "resources": [
           {
             "type": "irq",
-            "base": 122,
+            "base": 120,
             "triggered": 0,
             "enabled": true
           }
@@ -334,19 +410,28 @@
           "command": 1031,
           "header_type": 1,
           "secondary_bus": 1,
-          "irq": 122,
+          "irq": 120,
           "prog_if": 0
         },
         "driver": "pcieport",
+        "driver_module": "pcieportdrv",
         "drivers": [
           "pcieport"
         ],
+        "driver_modules": [
+          "pcieportdrv"
+        ],
         "module_alias": "pci:v00008086d000031D8sv00001458sd00001000bc06sc04i00"
       },
       {
         "index": 17,
         "attached_to": 0,
+        "class_list": [
+          "pci",
+          "bridge"
+        ],
         "bus_type": {
+          "hex": "0004",
           "name": "PCI",
           "value": 4
         },
@@ -355,27 +440,34 @@
           "number": 0
         },
         "base_class": {
+          "hex": "0006",
           "name": "Bridge",
           "value": 6
         },
         "sub_class": {
+          "hex": "0000",
           "name": "Host bridge",
           "value": 0
         },
         "vendor": {
+          "hex": "8086",
           "name": "Intel Corporation",
           "value": 32902
         },
         "sub_vendor": {
+          "hex": "1458",
           "value": 5208
         },
         "device": {
+          "hex": "31f0",
           "value": 12784
         },
         "sub_device": {
+          "hex": "1000",
           "value": 4096
         },
         "revision": {
+          "hex": "0003",
           "value": 3
         },
         "model": "Intel Host bridge",
@@ -395,7 +487,12 @@
       {
         "index": 20,
         "attached_to": 0,
+        "class_list": [
+          "pci",
+          "bridge"
+        ],
         "bus_type": {
+          "hex": "0004",
           "name": "PCI",
           "value": 4
         },
@@ -404,31 +501,39 @@
           "number": 19
         },
         "base_class": {
+          "hex": "0006",
           "name": "Bridge",
           "value": 6
         },
         "sub_class": {
+          "hex": "0004",
           "name": "PCI bridge",
           "value": 4
         },
         "pci_interface": {
+          "hex": "0000",
           "name": "Normal decode",
           "value": 0
         },
         "vendor": {
+          "hex": "8086",
           "name": "Intel Corporation",
           "value": 32902
         },
         "sub_vendor": {
+          "hex": "1458",
           "value": 5208
         },
         "device": {
+          "hex": "31db",
           "value": 12763
         },
         "sub_device": {
+          "hex": "1000",
           "value": 4096
         },
         "revision": {
+          "hex": "00f3",
           "value": 243
         },
         "model": "Intel PCI bridge",
@@ -437,7 +542,7 @@
         "resources": [
           {
             "type": "irq",
-            "base": 124,
+            "base": 122,
             "triggered": 0,
             "enabled": true
           }
@@ -447,13 +552,17 @@
           "command": 1031,
           "header_type": 1,
           "secondary_bus": 3,
-          "irq": 124,
+          "irq": 122,
           "prog_if": 0
         },
         "driver": "pcieport",
+        "driver_module": "pcieportdrv",
         "drivers": [
           "pcieport"
         ],
+        "driver_modules": [
+          "pcieportdrv"
+        ],
         "module_alias": "pci:v00008086d000031DBsv00001458sd00001000bc06sc04i00"
       }
     ],
@@ -461,6 +570,7 @@
       {
         "architecture": "x86_64",
         "vendor_name": "GenuineIntel",
+        "model_name": "Intel(R) Celeron(R) J4105 CPU @ 1.50GHz",
         "family": 6,
         "model": 122,
         "stepping": 1,
@@ -582,112 +692,38 @@
           "rfds",
           "bhi"
         ],
+        "power_management": [
+          ""
+        ],
         "bogo": 2995.2,
         "cache": 4096,
         "units": 64,
         "physical_id": 0,
         "siblings": 4,
         "cores": 4,
-        "fpu": true,
-        "fpu_exception": true,
+        "fpu": false,
+        "fpu_exception": false,
         "cpuid_level": 24,
         "write_protect": false,
         "clflush_size": 64,
         "cache_alignment": 64,
         "address_sizes": {
-          "physical": 39,
-          "virtual": 48
+          "physical": "0x27",
+          "virtual": "0x30"
         }
       }
     ],
     "disk": [
       {
         "index": 25,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 7,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Disk",
-          "value": 0
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "VIRTUAL-DISK",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "serial": "beaf61",
-        "model": "IET VIRTUAL-DISK",
-        "sysfs_id": "/class/block/sdf",
-        "sysfs_bus_id": "7:0:0:1",
-        "sysfs_device_link": "/devices/platform/host7/session47/target7:0:0/7:0:0:1",
-        "unix_device_name": "/dev/sdf",
-        "unix_device_number": {
-          "type": 98,
-          "major": 8,
-          "minor": 80,
-          "range": 16
-        },
-        "unix_device_names": [
-          "/dev/disk/by-diskseq/62",
-          "/dev/disk/by-id/scsi-360000000000000000e00000000060001",
-          "/dev/disk/by-id/wwn-0x60000000000000000e00000000060001",
-          "/dev/disk/by-path/ip-10.42.1.180:3260-iscsi-iqn.2019-10.io.longhorn:pvc-9a1d2ca8-edce-416c-b41b-42bcd3380887-lun-1",
-          "/dev/disk/by-uuid/35036532-23d4-4038-bfe6-15a86e793ed5",
-          "/dev/sdf"
-        ],
-        "unix_device_name2": "/dev/sg14",
-        "unix_device_number2": {
-          "type": 99,
-          "major": 21,
-          "minor": 14,
-          "range": 1
-        },
-        "resources": [
-          {
-            "type": "disk_geo",
-            "cylinders": 1018,
-            "heads": 166,
-            "sectors": 62,
-            "size": 0,
-            "geo_type": "logical"
-          },
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 10485760,
-            "value_2": 512
-          }
-        ],
-        "driver": "sd",
-        "driver_module": "sd_mod",
-        "drivers": [
-          "sd"
-        ],
-        "driver_modules": [
-          "sd_mod"
-        ]
-      },
-      {
-        "index": 26,
         "attached_to": 14,
+        "class_list": [
+          "disk",
+          "block_device",
+          "nvme"
+        ],
         "bus_type": {
+          "hex": "0096",
           "name": "NVME",
           "value": 150
         },
@@ -696,24 +732,30 @@
           "number": 0
         },
         "base_class": {
+          "hex": "0106",
           "name": "Mass Storage Device",
           "value": 262
         },
         "sub_class": {
+          "hex": "0000",
           "name": "Disk",
           "value": 0
         },
         "vendor": {
+          "hex": "2646",
           "value": 9798
         },
         "sub_vendor": {
+          "hex": "2646",
           "value": 9798
         },
         "device": {
+          "hex": "5017",
           "name": "KINGSTON SNV2S1000G",
           "value": 20503
         },
         "sub_device": {
+          "hex": "5017",
           "value": 20503
         },
         "serial": "50026B7784EB3FFB",
@@ -729,7 +771,6 @@
           "range": 0
         },
         "unix_device_names": [
-          "/dev/disk/by-diskseq/1",
           "/dev/disk/by-id/nvme-KINGSTON_SNV2S1000G_50026B7784EB3FFB",
           "/dev/disk/by-id/nvme-KINGSTON_SNV2S1000G_50026B7784EB3FFB_1",
           "/dev/disk/by-id/nvme-eui.00000000000000000026b7784eb3ffb5",
@@ -742,7 +783,7 @@
             "cylinders": 953869,
             "heads": 64,
             "sectors": 32,
-            "size": 0,
+            "size": "0x0",
             "geo_type": "logical"
           },
           {
@@ -762,584 +803,15 @@
         ]
       },
       {
-        "index": 27,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 5,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Disk",
-          "value": 0
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "VIRTUAL-DISK",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "serial": "beaf41",
-        "model": "IET VIRTUAL-DISK",
-        "sysfs_id": "/class/block/sdd",
-        "sysfs_bus_id": "5:0:0:1",
-        "sysfs_device_link": "/devices/platform/host5/session46/target5:0:0/5:0:0:1",
-        "unix_device_name": "/dev/sdd",
-        "unix_device_number": {
-          "type": 98,
-          "major": 8,
-          "minor": 48,
-          "range": 16
-        },
-        "unix_device_names": [
-          "/dev/disk/by-diskseq/61",
-          "/dev/disk/by-id/scsi-360000000000000000e00000000040001",
-          "/dev/disk/by-id/wwn-0x60000000000000000e00000000040001",
-          "/dev/disk/by-path/ip-10.42.1.180:3260-iscsi-iqn.2019-10.io.longhorn:radicale-lun-1",
-          "/dev/disk/by-uuid/6378cbe8-6c3e-4a9c-8397-9530d32668fb",
-          "/dev/sdd"
-        ],
-        "unix_device_name2": "/dev/sg12",
-        "unix_device_number2": {
-          "type": 99,
-          "major": 21,
-          "minor": 12,
-          "range": 1
-        },
-        "resources": [
-          {
-            "type": "disk_geo",
-            "cylinders": 1008,
-            "heads": 7,
-            "sectors": 58,
-            "size": 0,
-            "geo_type": "logical"
-          },
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 409600,
-            "value_2": 512
-          }
-        ],
-        "driver": "sd",
-        "driver_module": "sd_mod",
-        "drivers": [
-          "sd"
-        ],
-        "driver_modules": [
-          "sd_mod"
-        ]
-      },
-      {
-        "index": 28,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 3,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Disk",
-          "value": 0
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "VIRTUAL-DISK",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "serial": "beaf31",
-        "model": "IET VIRTUAL-DISK",
-        "sysfs_id": "/class/block/sdb",
-        "sysfs_bus_id": "3:0:0:1",
-        "sysfs_device_link": "/devices/platform/host3/session31/target3:0:0/3:0:0:1",
-        "unix_device_name": "/dev/sdb",
-        "unix_device_number": {
-          "type": 98,
-          "major": 8,
-          "minor": 16,
-          "range": 16
-        },
-        "unix_device_names": [
-          "/dev/disk/by-diskseq/46",
-          "/dev/disk/by-id/scsi-360000000000000000e00000000030001",
-          "/dev/disk/by-id/wwn-0x60000000000000000e00000000030001",
-          "/dev/disk/by-path/ip-10.42.1.148:3260-iscsi-iqn.2019-10.io.longhorn:freshrss-lun-1",
-          "/dev/disk/by-uuid/dd58e1cc-0b35-43e8-b267-c899b93bfb58",
-          "/dev/sdb"
-        ],
-        "unix_device_name2": "/dev/sg4",
-        "unix_device_number2": {
-          "type": 99,
-          "major": 21,
-          "minor": 4,
-          "range": 1
-        },
-        "resources": [
-          {
-            "type": "disk_geo",
-            "cylinders": 1011,
-            "heads": 34,
-            "sectors": 61,
-            "size": 0,
-            "geo_type": "logical"
-          },
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 2097152,
-            "value_2": 512
-          }
-        ],
-        "driver": "sd",
-        "driver_module": "sd_mod",
-        "drivers": [
-          "sd"
-        ],
-        "driver_modules": [
-          "sd_mod"
-        ]
-      },
-      {
-        "index": 29,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 11,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Disk",
-          "value": 0
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "VIRTUAL-DISK",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "serial": "beaf51",
-        "model": "IET VIRTUAL-DISK",
-        "sysfs_id": "/class/block/sdk",
-        "sysfs_bus_id": "11:0:0:1",
-        "sysfs_device_link": "/devices/platform/host11/session45/target11:0:0/11:0:0:1",
-        "unix_device_name": "/dev/sdk",
-        "unix_device_number": {
-          "type": 98,
-          "major": 8,
-          "minor": 160,
-          "range": 16
-        },
-        "unix_device_names": [
-          "/dev/disk/by-diskseq/60",
-          "/dev/disk/by-id/scsi-360000000000000000e00000000050001",
-          "/dev/disk/by-id/wwn-0x60000000000000000e00000000050001",
-          "/dev/disk/by-path/ip-10.42.1.180:3260-iscsi-iqn.2019-10.io.longhorn:atuin-db-lun-1",
-          "/dev/disk/by-uuid/2f56d1b7-45ad-4a6f-b1f7-fcfa01ef03af",
-          "/dev/sdk"
-        ],
-        "unix_device_name2": "/dev/sg10",
-        "unix_device_number2": {
-          "type": 99,
-          "major": 21,
-          "minor": 10,
-          "range": 1
-        },
-        "resources": [
-          {
-            "type": "disk_geo",
-            "cylinders": 1024,
-            "heads": 10,
-            "sectors": 60,
-            "size": 0,
-            "geo_type": "logical"
-          },
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 614400,
-            "value_2": 512
-          }
-        ],
-        "driver": "sd",
-        "driver_module": "sd_mod",
-        "drivers": [
-          "sd"
-        ],
-        "driver_modules": [
-          "sd_mod"
-        ]
-      },
-      {
-        "index": 30,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 2,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Disk",
-          "value": 0
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "VIRTUAL-DISK",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "serial": "beaf21",
-        "model": "IET VIRTUAL-DISK",
-        "sysfs_id": "/class/block/sdi",
-        "sysfs_bus_id": "2:0:0:1",
-        "sysfs_device_link": "/devices/platform/host2/session37/target2:0:0/2:0:0:1",
-        "unix_device_name": "/dev/sdi",
-        "unix_device_number": {
-          "type": 98,
-          "major": 8,
-          "minor": 128,
-          "range": 16
-        },
-        "unix_device_names": [
-          "/dev/disk/by-diskseq/52",
-          "/dev/disk/by-path/ip-10.42.1.180:3260-iscsi-iqn.2019-10.io.longhorn:attic-lun-1",
-          "/dev/disk/by-uuid/bd47a75f-71d2-4e73-85e1-65997fcef2c2",
-          "/dev/sdi"
-        ],
-        "unix_device_name2": "/dev/sg6",
-        "unix_device_number2": {
-          "type": 99,
-          "major": 21,
-          "minor": 6,
-          "range": 1
-        },
-        "resources": [
-          {
-            "type": "disk_geo",
-            "cylinders": 15360,
-            "heads": 64,
-            "sectors": 32,
-            "size": 0,
-            "geo_type": "logical"
-          },
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 31457280,
-            "value_2": 512
-          }
-        ],
-        "driver": "sd",
-        "driver_module": "sd_mod",
-        "drivers": [
-          "sd"
-        ],
-        "driver_modules": [
-          "sd_mod"
-        ]
-      },
-      {
-        "index": 31,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 8,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Disk",
-          "value": 0
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "VIRTUAL-DISK",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "serial": "beaf11",
-        "model": "IET VIRTUAL-DISK",
-        "sysfs_id": "/class/block/sdg",
-        "sysfs_bus_id": "8:0:0:1",
-        "sysfs_device_link": "/devices/platform/host8/session48/target8:0:0/8:0:0:1",
-        "unix_device_name": "/dev/sdg",
-        "unix_device_number": {
-          "type": 98,
-          "major": 8,
-          "minor": 96,
-          "range": 16
-        },
-        "unix_device_names": [
-          "/dev/disk/by-diskseq/63",
-          "/dev/disk/by-id/scsi-360000000000000000e00000000010001",
-          "/dev/disk/by-id/wwn-0x60000000000000000e00000000010001",
-          "/dev/disk/by-path/ip-10.42.1.5:3260-iscsi-iqn.2019-10.io.longhorn:prowlarr-lun-1",
-          "/dev/disk/by-uuid/485930ae-2fe2-4470-b99a-dc61a93d921c",
-          "/dev/sdg"
-        ],
-        "unix_device_name2": "/dev/sg16",
-        "unix_device_number2": {
-          "type": 99,
-          "major": 21,
-          "minor": 16,
-          "range": 1
-        },
-        "resources": [
-          {
-            "type": "disk_geo",
-            "cylinders": 1024,
-            "heads": 5,
-            "sectors": 60,
-            "size": 0,
-            "geo_type": "logical"
-          },
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 307200,
-            "value_2": 512
-          }
-        ],
-        "driver": "sd",
-        "driver_module": "sd_mod",
-        "drivers": [
-          "sd"
-        ],
-        "driver_modules": [
-          "sd_mod"
-        ]
-      },
-      {
-        "index": 32,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 6,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Disk",
-          "value": 0
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "VIRTUAL-DISK",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "serial": "beaf11",
-        "model": "IET VIRTUAL-DISK",
-        "sysfs_id": "/class/block/sde",
-        "sysfs_bus_id": "6:0:0:1",
-        "sysfs_device_link": "/devices/platform/host6/session42/target6:0:0/6:0:0:1",
-        "unix_device_name": "/dev/sde",
-        "unix_device_number": {
-          "type": 98,
-          "major": 8,
-          "minor": 64,
-          "range": 16
-        },
-        "unix_device_names": [
-          "/dev/disk/by-diskseq/57",
-          "/dev/disk/by-path/ip-10.42.1.180:3260-iscsi-iqn.2019-10.io.longhorn:forgejo-lun-1",
-          "/dev/disk/by-uuid/0448fef2-ca9e-4a75-9d21-e148e3e9fe34",
-          "/dev/sde"
-        ],
-        "unix_device_name2": "/dev/sg8",
-        "unix_device_number2": {
-          "type": 99,
-          "major": 21,
-          "minor": 8,
-          "range": 1
-        },
-        "resources": [
-          {
-            "type": "disk_geo",
-            "cylinders": 20480,
-            "heads": 64,
-            "sectors": 32,
-            "size": 0,
-            "geo_type": "logical"
-          },
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 41943040,
-            "value_2": 512
-          }
-        ],
-        "driver": "sd",
-        "driver_module": "sd_mod",
-        "drivers": [
-          "sd"
-        ],
-        "driver_modules": [
-          "sd_mod"
-        ]
-      },
-      {
-        "index": 33,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 4,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Disk",
-          "value": 0
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "VIRTUAL-DISK",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "serial": "beaf21",
-        "model": "IET VIRTUAL-DISK",
-        "sysfs_id": "/class/block/sdc",
-        "sysfs_bus_id": "4:0:0:1",
-        "sysfs_device_link": "/devices/platform/host4/session29/target4:0:0/4:0:0:1",
-        "unix_device_name": "/dev/sdc",
-        "unix_device_number": {
-          "type": 98,
-          "major": 8,
-          "minor": 32,
-          "range": 16
-        },
-        "unix_device_names": [
-          "/dev/disk/by-diskseq/44",
-          "/dev/disk/by-path/ip-10.42.1.148:3260-iscsi-iqn.2019-10.io.longhorn:atuin-lun-1",
-          "/dev/disk/by-uuid/f4def3ee-1977-48a5-8c34-badb13c8e3b1",
-          "/dev/sdc"
-        ],
-        "unix_device_name2": "/dev/sg2",
-        "unix_device_number2": {
-          "type": 99,
-          "major": 21,
-          "minor": 2,
-          "range": 1
-        },
-        "resources": [
-          {
-            "type": "disk_geo",
-            "cylinders": 1024,
-            "heads": 10,
-            "sectors": 60,
-            "size": 0,
-            "geo_type": "logical"
-          },
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 614400,
-            "value_2": 512
-          }
-        ],
-        "driver": "sd",
-        "driver_module": "sd_mod",
-        "drivers": [
-          "sd"
-        ],
-        "driver_modules": [
-          "sd_mod"
-        ]
-      },
-      {
-        "index": 34,
+        "index": 26,
         "attached_to": 18,
+        "class_list": [
+          "disk",
+          "ide",
+          "block_device"
+        ],
         "bus_type": {
+          "hex": "0085",
           "name": "IDE",
           "value": 133
         },
@@ -1348,22 +820,27 @@
           "number": 0
         },
         "base_class": {
+          "hex": "0106",
           "name": "Mass Storage Device",
           "value": 262
         },
         "sub_class": {
+          "hex": "0000",
           "name": "Disk",
           "value": 0
         },
         "vendor": {
+          "hex": "0000",
           "name": "Hitachi",
           "value": 0
         },
         "device": {
+          "hex": "0000",
           "name": "HTS72755",
           "value": 0
         },
         "revision": {
+          "hex": "0000",
           "name": "A0E0",
           "value": 0
         },
@@ -1380,7 +857,6 @@
           "range": 16
         },
         "unix_device_names": [
-          "/dev/disk/by-diskseq/2",
           "/dev/disk/by-id/ata-Hitachi_HTS727550A9E364_J33B0084GPB4PB",
           "/dev/disk/by-id/wwn-0x5000cca68cc9b5a7",
           "/dev/disk/by-path/pci-0000:00:12.0-ata-1",
@@ -1393,7 +869,7 @@
             "cylinders": 60801,
             "heads": 255,
             "sectors": 63,
-            "size": 0,
+            "size": "0x0",
             "geo_type": "logical"
           },
           {
@@ -1413,96 +889,18 @@
           "ahci",
           "sd_mod"
         ]
-      },
-      {
-        "index": 35,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 9,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Disk",
-          "value": 0
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "VIRTUAL-DISK",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "serial": "beaf21",
-        "model": "IET VIRTUAL-DISK",
-        "sysfs_id": "/class/block/sdh",
-        "sysfs_bus_id": "9:0:0:1",
-        "sysfs_device_link": "/devices/platform/host9/session50/target9:0:0/9:0:0:1",
-        "unix_device_name": "/dev/sdh",
-        "unix_device_number": {
-          "type": 98,
-          "major": 8,
-          "minor": 112,
-          "range": 16
-        },
-        "unix_device_names": [
-          "/dev/disk/by-diskseq/65",
-          "/dev/disk/by-id/scsi-360000000000000000e00000000020001",
-          "/dev/disk/by-id/wwn-0x60000000000000000e00000000020001",
-          "/dev/disk/by-path/ip-10.42.1.5:3260-iscsi-iqn.2019-10.io.longhorn:paperless-data-lun-1",
-          "/dev/disk/by-uuid/682d7efc-356e-4180-aff9-e5e6a7792702",
-          "/dev/sdh"
-        ],
-        "unix_device_name2": "/dev/sg18",
-        "unix_device_number2": {
-          "type": 99,
-          "major": 21,
-          "minor": 18,
-          "range": 1
-        },
-        "resources": [
-          {
-            "type": "disk_geo",
-            "cylinders": 10240,
-            "heads": 64,
-            "sectors": 32,
-            "size": 0,
-            "geo_type": "logical"
-          },
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 20971520,
-            "value_2": 512
-          }
-        ],
-        "driver": "sd",
-        "driver_module": "sd_mod",
-        "drivers": [
-          "sd"
-        ],
-        "driver_modules": [
-          "sd_mod"
-        ]
       }
     ],
     "graphics_card": [
       {
         "index": 23,
         "attached_to": 0,
+        "class_list": [
+          "graphics_card",
+          "pci"
+        ],
         "bus_type": {
+          "hex": "0004",
           "name": "PCI",
           "value": 4
         },
@@ -1511,31 +909,39 @@
           "number": 2
         },
         "base_class": {
+          "hex": "0003",
           "name": "Display controller",
           "value": 3
         },
         "sub_class": {
+          "hex": "0000",
           "name": "VGA compatible controller",
           "value": 0
         },
         "pci_interface": {
+          "hex": "0000",
           "name": "VGA",
           "value": 0
         },
         "vendor": {
+          "hex": "8086",
           "name": "Intel Corporation",
           "value": 32902
         },
         "sub_vendor": {
+          "hex": "1458",
           "value": 5208
         },
         "device": {
+          "hex": "3185",
           "value": 12677
         },
         "sub_device": {
+          "hex": "1000",
           "value": 4096
         },
         "revision": {
+          "hex": "0003",
           "value": 3
         },
         "model": "Intel VGA compatible controller",
@@ -1551,7 +957,7 @@
           },
           {
             "type": "irq",
-            "base": 134,
+            "base": 136,
             "triggered": 0,
             "enabled": true
           },
@@ -1585,7 +991,7 @@
           "command": 1031,
           "header_type": 0,
           "secondary_bus": 0,
-          "irq": 134,
+          "irq": 136,
           "prog_if": 0
         },
         "driver": "i915",
@@ -1602,9 +1008,14 @@
     ],
     "hub": [
       {
-        "index": 46,
+        "index": 28,
         "attached_to": 21,
+        "class_list": [
+          "usb",
+          "hub"
+        ],
         "bus_type": {
+          "hex": "0086",
           "name": "USB",
           "value": 134
         },
@@ -1613,23 +1024,27 @@
           "number": 0
         },
         "base_class": {
+          "hex": "010a",
           "name": "Hub",
           "value": 266
         },
         "vendor": {
-          "name": "Linux 6.6.43 xhci-hcd",
+          "hex": "1d6b",
+          "name": "Linux 6.14.8 xhci-hcd",
           "value": 7531
         },
         "device": {
+          "hex": "0002",
           "name": "xHCI Host Controller",
           "value": 2
         },
         "revision": {
-          "name": "6.06",
+          "hex": "0000",
+          "name": "6.14",
           "value": 0
         },
         "serial": "0000:00:15.0",
-        "model": "Linux 6.6.43 xhci-hcd xHCI Host Controller",
+        "model": "Linux 6.14.8 xhci-hcd xHCI Host Controller",
         "sysfs_id": "/devices/pci0000:00/0000:00:15.0/usb1/1-0:1.0",
         "sysfs_bus_id": "1-0:1.0",
         "resources": [
@@ -1644,19 +1059,23 @@
         ],
         "detail": {
           "device_class": {
+            "hex": "0009",
             "name": "hub",
             "value": 9
           },
           "device_subclass": {
+            "hex": "0000",
             "name": "per_interface",
             "value": 0
           },
           "device_protocol": 1,
           "interface_class": {
+            "hex": "0009",
             "name": "hub",
             "value": 9
           },
           "interface_subclass": {
+            "hex": "0000",
             "name": "per_interface",
             "value": 0
           },
@@ -1666,15 +1085,24 @@
         },
         "hotplug": "usb",
         "driver": "hub",
+        "driver_module": "usbcore",
         "drivers": [
           "hub"
         ],
-        "module_alias": "usb:v1D6Bp0002d0606dc09dsc00dp01ic09isc00ip00in00"
+        "driver_modules": [
+          "usbcore"
+        ],
+        "module_alias": "usb:v1D6Bp0002d0614dc09dsc00dp01ic09isc00ip00in00"
       },
       {
-        "index": 48,
+        "index": 30,
         "attached_to": 21,
+        "class_list": [
+          "usb",
+          "hub"
+        ],
         "bus_type": {
+          "hex": "0086",
           "name": "USB",
           "value": 134
         },
@@ -1683,40 +1111,48 @@
           "number": 0
         },
         "base_class": {
+          "hex": "010a",
           "name": "Hub",
           "value": 266
         },
         "vendor": {
-          "name": "Linux 6.6.43 xhci-hcd",
+          "hex": "1d6b",
+          "name": "Linux 6.14.8 xhci-hcd",
           "value": 7531
         },
         "device": {
+          "hex": "0003",
           "name": "xHCI Host Controller",
           "value": 3
         },
         "revision": {
-          "name": "6.06",
+          "hex": "0000",
+          "name": "6.14",
           "value": 0
         },
         "serial": "0000:00:15.0",
-        "model": "Linux 6.6.43 xhci-hcd xHCI Host Controller",
+        "model": "Linux 6.14.8 xhci-hcd xHCI Host Controller",
         "sysfs_id": "/devices/pci0000:00/0000:00:15.0/usb2/2-0:1.0",
         "sysfs_bus_id": "2-0:1.0",
         "detail": {
           "device_class": {
+            "hex": "0009",
             "name": "hub",
             "value": 9
           },
           "device_subclass": {
+            "hex": "0000",
             "name": "per_interface",
             "value": 0
           },
           "device_protocol": 3,
           "interface_class": {
+            "hex": "0009",
             "name": "hub",
             "value": 9
           },
           "interface_subclass": {
+            "hex": "0000",
             "name": "per_interface",
             "value": 0
           },
@@ -1726,21 +1162,30 @@
         },
         "hotplug": "usb",
         "driver": "hub",
+        "driver_module": "usbcore",
         "drivers": [
           "hub"
         ],
-        "module_alias": "usb:v1D6Bp0003d0606dc09dsc00dp03ic09isc00ip00in00"
+        "driver_modules": [
+          "usbcore"
+        ],
+        "module_alias": "usb:v1D6Bp0003d0614dc09dsc00dp03ic09isc00ip00in00"
       }
     ],
     "memory": [
       {
         "index": 7,
         "attached_to": 0,
+        "class_list": [
+          "memory"
+        ],
         "base_class": {
+          "hex": "0101",
           "name": "Internally Used Class",
           "value": 257
         },
         "sub_class": {
+          "hex": "0002",
           "name": "Main Memory",
           "value": 2
         },
@@ -1749,7 +1194,7 @@
           {
             "type": "mem",
             "base": 0,
-            "range": 25008361472,
+            "range": 25003536384,
             "enabled": true,
             "access": "read_write",
             "prefetch": "unknown"
@@ -1765,7 +1210,12 @@
       {
         "index": 8,
         "attached_to": 20,
+        "class_list": [
+          "network_controller",
+          "pci"
+        ],
         "bus_type": {
+          "hex": "0004",
           "name": "PCI",
           "value": 4
         },
@@ -1774,26 +1224,33 @@
           "number": 0
         },
         "base_class": {
+          "hex": "0002",
           "name": "Network controller",
           "value": 2
         },
         "sub_class": {
+          "hex": "0000",
           "name": "Ethernet controller",
           "value": 0
         },
         "vendor": {
+          "hex": "10ec",
           "value": 4332
         },
         "sub_vendor": {
+          "hex": "1458",
           "value": 5208
         },
         "device": {
+          "hex": "8168",
           "value": 33128
         },
         "sub_device": {
+          "hex": "e000",
           "value": 57344
         },
         "revision": {
+          "hex": "0015",
           "value": 21
         },
         "model": "Ethernet controller",
@@ -1863,7 +1320,13 @@
       {
         "index": 12,
         "attached_to": 11,
+        "class_list": [
+          "network_controller",
+          "pci",
+          "wlan_card"
+        ],
         "bus_type": {
+          "hex": "0004",
           "name": "PCI",
           "value": 4
         },
@@ -1872,37 +1335,52 @@
           "number": 0
         },
         "base_class": {
+          "hex": "0002",
           "name": "Network controller",
           "value": 2
         },
         "sub_class": {
-          "name": "Network controller",
-          "value": 128
+          "hex": "0082",
+          "name": "WLAN controller",
+          "value": 130
         },
         "vendor": {
+          "hex": "8086",
           "name": "Intel Corporation",
           "value": 32902
         },
         "sub_vendor": {
+          "hex": "8086",
           "name": "Intel Corporation",
           "value": 32902
         },
         "device": {
+          "hex": "24fb",
           "value": 9467
         },
         "sub_device": {
+          "hex": "2110",
           "value": 8464
         },
         "revision": {
+          "hex": "0010",
           "value": 16
         },
-        "model": "Intel Network controller",
+        "model": "Intel WLAN controller",
         "sysfs_id": "/devices/pci0000:00/0000:00:13.2/0000:02:00.0",
         "sysfs_bus_id": "0000:02:00.0",
+        "unix_device_name": "wlo1",
+        "unix_device_names": [
+          "wlo1"
+        ],
         "resources": [
+          {
+            "type": "hwaddr",
+            "address": 102
+          },
           {
             "type": "irq",
-            "base": 20,
+            "base": 135,
             "triggered": 0,
             "enabled": true
           },
@@ -1913,47 +1391,171 @@
             "enabled": true,
             "access": "read_write",
             "prefetch": "no"
+          },
+          {
+            "type": "phwaddr",
+            "address": 102
+          },
+          {
+            "type": "wlan",
+            "channels": [
+              "1",
+              "2",
+              "3",
+              "4",
+              "5",
+              "6",
+              "7",
+              "8",
+              "9",
+              "10",
+              "11",
+              "12",
+              "13",
+              "14",
+              "36",
+              "40",
+              "44",
+              "48",
+              "52",
+              "56",
+              "60",
+              "64",
+              "100",
+              "104",
+              "108",
+              "112",
+              "116",
+              "120",
+              "124",
+              "128",
+              "132",
+              "136"
+            ],
+            "frequencies": [
+              "2.412",
+              "2.417",
+              "2.422",
+              "2.427",
+              "2.432",
+              "2.437",
+              "2.442",
+              "2.447",
+              "2.452",
+              "2.457",
+              "2.462",
+              "2.467",
+              "2.472",
+              "2.484",
+              "5.18",
+              "5.2",
+              "5.22",
+              "5.24",
+              "5.26",
+              "5.28",
+              "5.3",
+              "5.32",
+              "5.5",
+              "5.52",
+              "5.54",
+              "5.56",
+              "5.58",
+              "5.6",
+              "5.62",
+              "5.64",
+              "5.66",
+              "5.68"
+            ],
+            "auth_modes": [
+              "open",
+              "sharedkey",
+              "wpa-psk",
+              "wpa-eap"
+            ],
+            "enc_modes": [
+              "WEP40",
+              "WEP104",
+              "TKIP",
+              "CCMP"
+            ]
           }
         ],
         "detail": {
           "function": 0,
-          "command": 2,
+          "command": 1030,
           "header_type": 0,
           "secondary_bus": 0,
-          "irq": 20,
+          "irq": 135,
           "prog_if": 0
         },
+        "driver": "iwlwifi",
+        "driver_module": "iwlwifi",
+        "drivers": [
+          "iwlwifi"
+        ],
+        "driver_modules": [
+          "iwlwifi"
+        ],
         "module_alias": "pci:v00008086d000024FBsv00008086sd00002110bc02sc80i00",
         "label": "Onboard - RTK Ethernet"
       }
     ],
     "network_interface": [
       {
-        "index": 59,
-        "attached_to": 0,
+        "index": 35,
+        "attached_to": 12,
+        "class_list": [
+          "network_interface"
+        ],
         "base_class": {
+          "hex": "0107",
           "name": "Network Interface",
           "value": 263
         },
         "sub_class": {
-          "name": "Loopback",
-          "value": 0
+          "hex": "0001",
+          "name": "Ethernet",
+          "value": 1
         },
-        "model": "Loopback network interface",
-        "sysfs_id": "/class/net/lo",
-        "unix_device_name": "lo",
+        "model": "Ethernet network interface",
+        "sysfs_id": "/class/net/wlo1",
+        "sysfs_device_link": "/devices/pci0000:00/0000:00:13.2/0000:02:00.0",
+        "unix_device_name": "wlo1",
         "unix_device_names": [
-          "lo"
+          "wlo1"
+        ],
+        "resources": [
+          {
+            "type": "hwaddr",
+            "address": 102
+          },
+          {
+            "type": "phwaddr",
+            "address": 102
+          }
+        ],
+        "driver": "iwlwifi",
+        "driver_module": "iwlwifi",
+        "drivers": [
+          "iwlwifi"
+        ],
+        "driver_modules": [
+          "iwlwifi"
         ]
       },
       {
-        "index": 90,
+        "index": 43,
         "attached_to": 8,
+        "class_list": [
+          "network_interface"
+        ],
         "base_class": {
+          "hex": "0107",
           "name": "Network Interface",
           "value": 263
         },
         "sub_class": {
+          "hex": "0001",
           "name": "Ethernet",
           "value": 1
         },
@@ -1982,203 +1584,41 @@
         "driver_modules": [
           "r8169"
         ]
-      }
-    ],
-    "storage_controller": [
-      {
-        "index": 14,
-        "attached_to": 13,
-        "bus_type": {
-          "name": "PCI",
-          "value": 4
-        },
-        "slot": {
-          "bus": 1,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass storage controller",
-          "value": 1
-        },
-        "sub_class": {
-          "value": 8
-        },
-        "pci_interface": {
-          "value": 2
-        },
-        "vendor": {
-          "value": 9798
-        },
-        "sub_vendor": {
-          "value": 9798
-        },
-        "device": {
-          "value": 20503
-        },
-        "sub_device": {
-          "value": 20503
-        },
-        "revision": {
-          "value": 3
-        },
-        "model": "Mass storage controller",
-        "sysfs_id": "/devices/pci0000:00/0000:00:13.0/0000:01:00.0",
-        "sysfs_bus_id": "0000:01:00.0",
-        "resources": [
-          {
-            "type": "irq",
-            "base": 22,
-            "triggered": 0,
-            "enabled": true
-          },
-          {
-            "type": "mem",
-            "base": 2703228928,
-            "range": 16384,
-            "enabled": true,
-            "access": "read_write",
-            "prefetch": "no"
-          }
-        ],
-        "detail": {
-          "function": 0,
-          "command": 1030,
-          "header_type": 0,
-          "secondary_bus": 0,
-          "irq": 22,
-          "prog_if": 2
-        },
-        "driver": "nvme",
-        "driver_module": "nvme",
-        "drivers": [
-          "nvme"
-        ],
-        "driver_modules": [
-          "nvme"
-        ],
-        "module_alias": "pci:v00002646d00005017sv00002646sd00005017bc01sc08i02"
       },
       {
-        "index": 18,
+        "index": 53,
         "attached_to": 0,
-        "bus_type": {
-          "name": "PCI",
-          "value": 4
-        },
-        "slot": {
-          "bus": 0,
-          "number": 18
-        },
+        "class_list": [
+          "network_interface"
+        ],
         "base_class": {
-          "name": "Mass storage controller",
-          "value": 1
+          "hex": "0107",
+          "name": "Network Interface",
+          "value": 263
         },
         "sub_class": {
-          "value": 6
+          "hex": "0000",
+          "name": "Loopback",
+          "value": 0
         },
-        "pci_interface": {
-          "value": 1
-        },
-        "vendor": {
-          "name": "Intel Corporation",
-          "value": 32902
-        },
-        "sub_vendor": {
-          "value": 5208
-        },
-        "device": {
-          "value": 12771
-        },
-        "sub_device": {
-          "value": 4096
-        },
-        "revision": {
-          "value": 3
-        },
-        "model": "Intel Mass storage controller",
-        "sysfs_id": "/devices/pci0000:00/0000:00:12.0",
-        "sysfs_bus_id": "0000:00:12.0",
-        "resources": [
-          {
-            "type": "io",
-            "base": 61536,
-            "range": 32,
-            "enabled": true,
-            "access": "read_write"
-          },
-          {
-            "type": "io",
-            "base": 61568,
-            "range": 4,
-            "enabled": true,
-            "access": "read_write"
-          },
-          {
-            "type": "io",
-            "base": 61584,
-            "range": 8,
-            "enabled": true,
-            "access": "read_write"
-          },
-          {
-            "type": "irq",
-            "base": 131,
-            "triggered": 0,
-            "enabled": true
-          },
-          {
-            "type": "mem",
-            "base": 2704343040,
-            "range": 8192,
-            "enabled": true,
-            "access": "read_write",
-            "prefetch": "no"
-          },
-          {
-            "type": "mem",
-            "base": 2704371712,
-            "range": 2048,
-            "enabled": true,
-            "access": "read_write",
-            "prefetch": "no"
-          },
-          {
-            "type": "mem",
-            "base": 2704375808,
-            "range": 256,
-            "enabled": true,
-            "access": "read_write",
-            "prefetch": "no"
-          }
-        ],
-        "detail": {
-          "function": 0,
-          "command": 1031,
-          "header_type": 0,
-          "secondary_bus": 0,
-          "irq": 131,
-          "prog_if": 1
-        },
-        "driver": "ahci",
-        "driver_module": "ahci",
-        "drivers": [
-          "ahci"
-        ],
-        "driver_modules": [
-          "ahci"
-        ],
-        "module_alias": "pci:v00008086d000031E3sv00001458sd00001000bc01sc06i01",
-        "label": "Onboard - SATA"
+        "model": "Loopback network interface",
+        "sysfs_id": "/class/net/lo",
+        "unix_device_name": "lo",
+        "unix_device_names": [
+          "lo"
+        ]
       }
     ],
-    "system": {
-      "form_factor": "desktop"
-    },
-    "unknown": [
+    "pci": [
       {
         "index": 9,
         "attached_to": 0,
+        "class_list": [
+          "pci",
+          "unknown"
+        ],
         "bus_type": {
+          "hex": "0004",
           "name": "PCI",
           "value": 4
         },
@@ -2187,29 +1627,37 @@
           "number": 28
         },
         "base_class": {
+          "hex": "0008",
           "name": "Generic system peripheral",
           "value": 8
         },
         "sub_class": {
+          "hex": "0005",
           "value": 5
         },
         "pci_interface": {
+          "hex": "0001",
           "value": 1
         },
         "vendor": {
+          "hex": "8086",
           "name": "Intel Corporation",
           "value": 32902
         },
         "sub_vendor": {
+          "hex": "1458",
           "value": 5208
         },
         "device": {
+          "hex": "31cc",
           "value": 12748
         },
         "sub_device": {
+          "hex": "1000",
           "value": 4096
         },
         "revision": {
+          "hex": "0003",
           "value": 3
         },
         "model": "Intel Generic system peripheral",
@@ -2261,7 +1709,12 @@
       {
         "index": 15,
         "attached_to": 0,
+        "class_list": [
+          "pci",
+          "unknown"
+        ],
         "bus_type": {
+          "hex": "0004",
           "name": "PCI",
           "value": 4
         },
@@ -2270,29 +1723,37 @@
           "number": 30
         },
         "base_class": {
+          "hex": "0008",
           "name": "Generic system peripheral",
           "value": 8
         },
         "sub_class": {
+          "hex": "0005",
           "value": 5
         },
         "pci_interface": {
+          "hex": "0001",
           "value": 1
         },
         "vendor": {
+          "hex": "8086",
           "name": "Intel Corporation",
           "value": 32902
         },
         "sub_vendor": {
+          "hex": "1458",
           "value": 5208
         },
         "device": {
+          "hex": "31d0",
           "value": 12752
         },
         "sub_device": {
+          "hex": "1000",
           "value": 4096
         },
         "revision": {
+          "hex": "0003",
           "value": 3
         },
         "model": "Intel Generic system peripheral",
@@ -2344,7 +1805,12 @@
       {
         "index": 16,
         "attached_to": 0,
+        "class_list": [
+          "pci",
+          "unknown"
+        ],
         "bus_type": {
+          "hex": "0004",
           "name": "PCI",
           "value": 4
         },
@@ -2353,27 +1819,34 @@
           "number": 15
         },
         "base_class": {
+          "hex": "0007",
           "name": "Communication controller",
           "value": 7
         },
         "sub_class": {
+          "hex": "0080",
           "name": "Communication controller",
           "value": 128
         },
         "vendor": {
+          "hex": "8086",
           "name": "Intel Corporation",
           "value": 32902
         },
         "sub_vendor": {
+          "hex": "1458",
           "value": 5208
         },
         "device": {
+          "hex": "319a",
           "value": 12698
         },
         "sub_device": {
+          "hex": "1000",
           "value": 4096
         },
         "revision": {
+          "hex": "0003",
           "value": 3
         },
         "model": "Intel Communication controller",
@@ -2382,7 +1855,7 @@
         "resources": [
           {
             "type": "irq",
-            "base": 132,
+            "base": 134,
             "triggered": 0,
             "enabled": true
           },
@@ -2400,7 +1873,7 @@
           "command": 1030,
           "header_type": 0,
           "secondary_bus": 0,
-          "irq": 132,
+          "irq": 134,
           "prog_if": 0
         },
         "driver": "mei_me",
@@ -2417,7 +1890,12 @@
       {
         "index": 19,
         "attached_to": 0,
+        "class_list": [
+          "pci",
+          "unknown"
+        ],
         "bus_type": {
+          "hex": "0004",
           "name": "PCI",
           "value": 4
         },
@@ -2426,27 +1904,34 @@
           "number": 31
         },
         "base_class": {
+          "hex": "000c",
           "name": "Serial bus controller",
           "value": 12
         },
         "sub_class": {
+          "hex": "0005",
           "name": "SMBus",
           "value": 5
         },
         "vendor": {
+          "hex": "8086",
           "name": "Intel Corporation",
           "value": 32902
         },
         "sub_vendor": {
+          "hex": "1458",
           "value": 5208
         },
         "device": {
+          "hex": "31d4",
           "value": 12756
         },
         "sub_device": {
+          "hex": "1000",
           "value": 4096
         },
         "revision": {
+          "hex": "0003",
           "value": 3
         },
         "model": "Intel SMBus",
@@ -2497,7 +1982,12 @@
       {
         "index": 22,
         "attached_to": 0,
+        "class_list": [
+          "pci",
+          "unknown"
+        ],
         "bus_type": {
+          "hex": "0004",
           "name": "PCI",
           "value": 4
         },
@@ -2506,27 +1996,34 @@
           "number": 0
         },
         "base_class": {
+          "hex": "0008",
           "name": "Generic system peripheral",
           "value": 8
         },
         "sub_class": {
+          "hex": "0080",
           "name": "System peripheral",
           "value": 128
         },
         "vendor": {
+          "hex": "8086",
           "name": "Intel Corporation",
           "value": 32902
         },
         "sub_vendor": {
+          "hex": "1458",
           "value": 5208
         },
         "device": {
+          "hex": "3190",
           "value": 12688
         },
         "sub_device": {
+          "hex": "1000",
           "value": 4096
         },
         "revision": {
+          "hex": "0003",
           "value": 3
         },
         "model": "Intel System peripheral",
@@ -2558,23 +2055,248 @@
         },
         "module_alias": "pci:v00008086d00003190sv00001458sd00001000bc08sc80i00",
         "label": "Onboard - Other"
+      }
+    ],
+    "storage_controller": [
+      {
+        "index": 14,
+        "attached_to": 13,
+        "class_list": [
+          "storage_controller",
+          "pci"
+        ],
+        "bus_type": {
+          "hex": "0004",
+          "name": "PCI",
+          "value": 4
+        },
+        "slot": {
+          "bus": 1,
+          "number": 0
+        },
+        "base_class": {
+          "hex": "0001",
+          "name": "Mass storage controller",
+          "value": 1
+        },
+        "sub_class": {
+          "hex": "0008",
+          "value": 8
+        },
+        "pci_interface": {
+          "hex": "0002",
+          "value": 2
+        },
+        "vendor": {
+          "hex": "2646",
+          "value": 9798
+        },
+        "sub_vendor": {
+          "hex": "2646",
+          "value": 9798
+        },
+        "device": {
+          "hex": "5017",
+          "value": 20503
+        },
+        "sub_device": {
+          "hex": "5017",
+          "value": 20503
+        },
+        "revision": {
+          "hex": "0003",
+          "value": 3
+        },
+        "model": "Mass storage controller",
+        "sysfs_id": "/devices/pci0000:00/0000:00:13.0/0000:01:00.0",
+        "sysfs_bus_id": "0000:01:00.0",
+        "resources": [
+          {
+            "type": "irq",
+            "base": 22,
+            "triggered": 0,
+            "enabled": true
+          },
+          {
+            "type": "mem",
+            "base": 2703228928,
+            "range": 16384,
+            "enabled": true,
+            "access": "read_write",
+            "prefetch": "no"
+          }
+        ],
+        "detail": {
+          "function": 0,
+          "command": 1030,
+          "header_type": 0,
+          "secondary_bus": 0,
+          "irq": 22,
+          "prog_if": 2
+        },
+        "driver": "nvme",
+        "driver_module": "nvme",
+        "drivers": [
+          "nvme"
+        ],
+        "driver_modules": [
+          "nvme"
+        ],
+        "module_alias": "pci:v00002646d00005017sv00002646sd00005017bc01sc08i02"
       },
+      {
+        "index": 18,
+        "attached_to": 0,
+        "class_list": [
+          "storage_controller",
+          "pci"
+        ],
+        "bus_type": {
+          "hex": "0004",
+          "name": "PCI",
+          "value": 4
+        },
+        "slot": {
+          "bus": 0,
+          "number": 18
+        },
+        "base_class": {
+          "hex": "0001",
+          "name": "Mass storage controller",
+          "value": 1
+        },
+        "sub_class": {
+          "hex": "0006",
+          "value": 6
+        },
+        "pci_interface": {
+          "hex": "0001",
+          "value": 1
+        },
+        "vendor": {
+          "hex": "8086",
+          "name": "Intel Corporation",
+          "value": 32902
+        },
+        "sub_vendor": {
+          "hex": "1458",
+          "value": 5208
+        },
+        "device": {
+          "hex": "31e3",
+          "value": 12771
+        },
+        "sub_device": {
+          "hex": "1000",
+          "value": 4096
+        },
+        "revision": {
+          "hex": "0003",
+          "value": 3
+        },
+        "model": "Intel Mass storage controller",
+        "sysfs_id": "/devices/pci0000:00/0000:00:12.0",
+        "sysfs_bus_id": "0000:00:12.0",
+        "resources": [
+          {
+            "type": "io",
+            "base": 61536,
+            "range": 32,
+            "enabled": true,
+            "access": "read_write"
+          },
+          {
+            "type": "io",
+            "base": 61568,
+            "range": 4,
+            "enabled": true,
+            "access": "read_write"
+          },
+          {
+            "type": "io",
+            "base": 61584,
+            "range": 8,
+            "enabled": true,
+            "access": "read_write"
+          },
+          {
+            "type": "irq",
+            "base": 133,
+            "triggered": 0,
+            "enabled": true
+          },
+          {
+            "type": "mem",
+            "base": 2704343040,
+            "range": 8192,
+            "enabled": true,
+            "access": "read_write",
+            "prefetch": "no"
+          },
+          {
+            "type": "mem",
+            "base": 2704371712,
+            "range": 2048,
+            "enabled": true,
+            "access": "read_write",
+            "prefetch": "no"
+          },
+          {
+            "type": "mem",
+            "base": 2704375808,
+            "range": 256,
+            "enabled": true,
+            "access": "read_write",
+            "prefetch": "no"
+          }
+        ],
+        "detail": {
+          "function": 0,
+          "command": 1031,
+          "header_type": 0,
+          "secondary_bus": 0,
+          "irq": 133,
+          "prog_if": 1
+        },
+        "driver": "ahci",
+        "driver_module": "ahci",
+        "drivers": [
+          "ahci"
+        ],
+        "driver_modules": [
+          "ahci"
+        ],
+        "module_alias": "pci:v00008086d000031E3sv00001458sd00001000bc01sc06i01",
+        "label": "Onboard - SATA"
+      }
+    ],
+    "system": {
+      "form_factor": "desktop"
+    },
+    "unknown": [
       {
         "index": 24,
         "attached_to": 0,
+        "class_list": [
+          "unknown"
+        ],
         "base_class": {
+          "hex": "0007",
           "name": "Communication controller",
           "value": 7
         },
         "sub_class": {
+          "hex": "0000",
           "name": "Serial controller",
           "value": 0
         },
         "pci_interface": {
+          "hex": "0002",
           "name": "16550",
           "value": 2
         },
         "device": {
+          "hex": "0000",
           "name": "16550A",
           "value": 0
         },
@@ -2598,418 +2320,18 @@
             "enabled": true
           }
         ]
-      },
-      {
-        "index": 36,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 11,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Storage Device",
-          "value": 128
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "Controller",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "model": "IET Controller",
-        "sysfs_id": "/class/scsi_generic/sg9",
-        "sysfs_bus_id": "11:0:0:0",
-        "unix_device_name": "/dev/sg9",
-        "unix_device_number": {
-          "type": 99,
-          "major": 21,
-          "minor": 9,
-          "range": 1
-        },
-        "unix_device_names": [
-          "/dev/sg9"
-        ]
-      },
-      {
-        "index": 37,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 6,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Storage Device",
-          "value": 128
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "Controller",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "model": "IET Controller",
-        "sysfs_id": "/class/scsi_generic/sg7",
-        "sysfs_bus_id": "6:0:0:0",
-        "unix_device_name": "/dev/sg7",
-        "unix_device_number": {
-          "type": 99,
-          "major": 21,
-          "minor": 7,
-          "range": 1
-        },
-        "unix_device_names": [
-          "/dev/sg7"
-        ]
-      },
-      {
-        "index": 38,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 9,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Storage Device",
-          "value": 128
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "Controller",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "model": "IET Controller",
-        "sysfs_id": "/class/scsi_generic/sg17",
-        "sysfs_bus_id": "9:0:0:0",
-        "unix_device_name": "/dev/sg17",
-        "unix_device_number": {
-          "type": 99,
-          "major": 21,
-          "minor": 17,
-          "range": 1
-        },
-        "unix_device_names": [
-          "/dev/sg17"
-        ]
-      },
-      {
-        "index": 39,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 2,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Storage Device",
-          "value": 128
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "Controller",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "model": "IET Controller",
-        "sysfs_id": "/class/scsi_generic/sg5",
-        "sysfs_bus_id": "2:0:0:0",
-        "unix_device_name": "/dev/sg5",
-        "unix_device_number": {
-          "type": 99,
-          "major": 21,
-          "minor": 5,
-          "range": 1
-        },
-        "unix_device_names": [
-          "/dev/sg5"
-        ]
-      },
-      {
-        "index": 40,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 8,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Storage Device",
-          "value": 128
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "Controller",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "model": "IET Controller",
-        "sysfs_id": "/class/scsi_generic/sg15",
-        "sysfs_bus_id": "8:0:0:0",
-        "unix_device_name": "/dev/sg15",
-        "unix_device_number": {
-          "type": 99,
-          "major": 21,
-          "minor": 15,
-          "range": 1
-        },
-        "unix_device_names": [
-          "/dev/sg15"
-        ]
-      },
-      {
-        "index": 41,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 3,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Storage Device",
-          "value": 128
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "Controller",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "model": "IET Controller",
-        "sysfs_id": "/class/scsi_generic/sg3",
-        "sysfs_bus_id": "3:0:0:0",
-        "unix_device_name": "/dev/sg3",
-        "unix_device_number": {
-          "type": 99,
-          "major": 21,
-          "minor": 3,
-          "range": 1
-        },
-        "unix_device_names": [
-          "/dev/sg3"
-        ]
-      },
-      {
-        "index": 42,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 7,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Storage Device",
-          "value": 128
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "Controller",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "model": "IET Controller",
-        "sysfs_id": "/class/scsi_generic/sg13",
-        "sysfs_bus_id": "7:0:0:0",
-        "unix_device_name": "/dev/sg13",
-        "unix_device_number": {
-          "type": 99,
-          "major": 21,
-          "minor": 13,
-          "range": 1
-        },
-        "unix_device_names": [
-          "/dev/sg13"
-        ]
-      },
-      {
-        "index": 43,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 4,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Storage Device",
-          "value": 128
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "Controller",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "model": "IET Controller",
-        "sysfs_id": "/class/scsi_generic/sg1",
-        "sysfs_bus_id": "4:0:0:0",
-        "unix_device_name": "/dev/sg1",
-        "unix_device_number": {
-          "type": 99,
-          "major": 21,
-          "minor": 1,
-          "range": 1
-        },
-        "unix_device_names": [
-          "/dev/sg1"
-        ]
-      },
-      {
-        "index": 44,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 5,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Storage Device",
-          "value": 128
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "Controller",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "model": "IET Controller",
-        "sysfs_id": "/class/scsi_generic/sg11",
-        "sysfs_bus_id": "5:0:0:0",
-        "unix_device_name": "/dev/sg11",
-        "unix_device_number": {
-          "type": 99,
-          "major": 21,
-          "minor": 11,
-          "range": 1
-        },
-        "unix_device_names": [
-          "/dev/sg11"
-        ]
       }
     ],
     "usb_controller": [
       {
         "index": 21,
         "attached_to": 0,
+        "class_list": [
+          "usb_controller",
+          "pci"
+        ],
         "bus_type": {
+          "hex": "0004",
           "name": "PCI",
           "value": 4
         },
@@ -3018,30 +2340,38 @@
           "number": 21
         },
         "base_class": {
+          "hex": "000c",
           "name": "Serial bus controller",
           "value": 12
         },
         "sub_class": {
+          "hex": "0003",
           "name": "USB Controller",
           "value": 3
         },
         "pci_interface": {
+          "hex": "0030",
           "value": 48
         },
         "vendor": {
+          "hex": "8086",
           "name": "Intel Corporation",
           "value": 32902
         },
         "sub_vendor": {
+          "hex": "1458",
           "value": 5208
         },
         "device": {
+          "hex": "31a8",
           "value": 12712
         },
         "sub_device": {
+          "hex": "1000",
           "value": 4096
         },
         "revision": {
+          "hex": "0003",
           "value": 3
         },
         "model": "Intel USB Controller",
@@ -3050,7 +2380,7 @@
         "resources": [
           {
             "type": "irq",
-            "base": 125,
+            "base": 123,
             "triggered": 0,
             "enabled": true
           },
@@ -3068,7 +2398,7 @@
           "command": 1030,
           "header_type": 0,
           "secondary_bus": 0,
-          "irq": 125,
+          "irq": 123,
           "prog_if": 48
         },
         "driver": "xhci_hcd",
@@ -3118,6 +2448,7 @@
       "product": "MZGLKAP-00",
       "version": "1.x",
       "board_type": {
+        "hex": "000a",
         "name": "Motherboard",
         "value": 10
       },
@@ -3136,25 +2467,30 @@
         "size_current": 224,
         "speed": 0,
         "mode": {
+          "hex": "0001",
           "name": "Write Back",
           "value": 1
         },
         "enabled": true,
         "location": {
+          "hex": "0000",
           "name": "Internal",
           "value": 0
         },
         "socketed": false,
         "level": 0,
         "ecc": {
+          "hex": "0004",
           "name": "Parity",
           "value": 4
         },
         "cache_type": {
+          "hex": "0001",
           "name": "Other",
           "value": 1
         },
         "associativity": {
+          "hex": "0001",
           "name": "Other",
           "value": 1
         },
@@ -3172,25 +2508,30 @@
         "size_current": 4096,
         "speed": 0,
         "mode": {
+          "hex": "0001",
           "name": "Write Back",
           "value": 1
         },
         "enabled": true,
         "location": {
+          "hex": "0000",
           "name": "Internal",
           "value": 0
         },
         "socketed": false,
         "level": 1,
         "ecc": {
+          "hex": "0005",
           "name": "Single-bit",
           "value": 5
         },
         "cache_type": {
+          "hex": "0005",
           "name": "Unified",
           "value": 5
         },
         "associativity": {
+          "hex": "0008",
           "name": "16-way Set-Associative",
           "value": 8
         },
@@ -3202,33 +2543,40 @@
         ]
       }
     ],
-    "chassis": {
-      "handle": 3,
-      "manufacturer": "Default string",
-      "version": "Default string",
-      "chassis_type": {
-        "name": "Desktop",
-        "value": 3
-      },
-      "lock_present": false,
-      "bootup_state": {
-        "name": "Safe",
-        "value": 3
-      },
-      "power_state": {
-        "name": "Safe",
-        "value": 3
-      },
-      "thermal_state": {
-        "name": "Safe",
-        "value": 3
-      },
-      "security_state": {
-        "name": "None",
-        "value": 3
-      },
-      "oem": "0x0"
-    },
+    "chassis": [
+      {
+        "handle": 3,
+        "manufacturer": "Default string",
+        "version": "Default string",
+        "chassis_type": {
+          "hex": "0003",
+          "name": "Desktop",
+          "value": 3
+        },
+        "lock_present": false,
+        "bootup_state": {
+          "hex": "0003",
+          "name": "Safe",
+          "value": 3
+        },
+        "power_state": {
+          "hex": "0003",
+          "name": "Safe",
+          "value": 3
+        },
+        "thermal_state": {
+          "hex": "0003",
+          "name": "Safe",
+          "value": 3
+        },
+        "security_state": {
+          "hex": "0003",
+          "name": "None",
+          "value": 3
+        },
+        "oem": "0x0"
+      }
+    ],
     "config": {
       "handle": 34,
       "options": [
@@ -3247,18 +2595,21 @@
       {
         "handle": 35,
         "location": {
+          "hex": "0003",
           "name": "Motherboard",
           "value": 3
         },
         "usage": {
+          "hex": "0003",
           "name": "System memory",
           "value": 3
         },
         "ecc": {
+          "hex": "0003",
           "name": "None",
           "value": 3
         },
-        "max_size": 33554432,
+        "max_size": "0x2000000",
         "error_handle": 65534,
         "slots": 2
       }
@@ -3267,8 +2618,8 @@
       {
         "handle": 36,
         "array_handle": 35,
-        "start_address": 0,
-        "end_address": 25769803776,
+        "start_address": "0x0",
+        "end_address": "0x600000000",
         "part_width": 2
       }
     ],
@@ -3285,11 +2636,13 @@
         "ecc_bits": 0,
         "size": 16777216,
         "form_factor": {
+          "hex": "000d",
           "name": "SODIMM",
           "value": 13
         },
         "set": 0,
         "memory_type": {
+          "hex": "001a",
           "name": "Other",
           "value": 26
         },
@@ -3310,11 +2663,13 @@
         "ecc_bits": 0,
         "size": 8388608,
         "form_factor": {
+          "hex": "000d",
           "name": "SODIMM",
           "value": 13
         },
         "set": 0,
         "memory_type": {
+          "hex": "001a",
           "name": "Other",
           "value": 26
         },
@@ -3329,8 +2684,8 @@
         "handle": 38,
         "memory_device_handle": 37,
         "array_map_handle": 36,
-        "start_address": 0,
-        "end_address": 17179869184,
+        "start_address": "0x0",
+        "end_address": "0x400000000",
         "row_position": 255,
         "interleave_position": 1,
         "interleave_depth": 2
@@ -3339,8 +2694,8 @@
         "handle": 40,
         "memory_device_handle": 39,
         "array_map_handle": 36,
-        "start_address": 17179869184,
-        "end_address": 25769803776,
+        "start_address": "0x400000000",
+        "end_address": "0x600000000",
         "row_position": 255,
         "interleave_position": 2,
         "interleave_depth": 2
@@ -3353,6 +2708,7 @@
           {
             "name": "To Be Filled By O.E.M.",
             "type": {
+              "hex": "0003",
               "name": "Video",
               "value": 3
             },
@@ -3365,11 +2721,13 @@
       {
         "handle": 8,
         "port_type": {
+          "hex": "000e",
           "name": "Mouse Port",
           "value": 14
         },
         "internal_reference_designator": "J1A1",
         "external_connector_type": {
+          "hex": "000f",
           "name": "PS/2",
           "value": 15
         },
@@ -3378,11 +2736,13 @@
       {
         "handle": 9,
         "port_type": {
+          "hex": "000d",
           "name": "Keyboard Port",
           "value": 13
         },
         "internal_reference_designator": "J1A1",
         "external_connector_type": {
+          "hex": "000f",
           "name": "PS/2",
           "value": 15
         },
@@ -3391,11 +2751,13 @@
       {
         "handle": 10,
         "port_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
         "internal_reference_designator": "J2A1",
         "external_connector_type": {
+          "hex": "001d",
           "name": "Mini-Centronics Type-14",
           "value": 29
         },
@@ -3404,11 +2766,13 @@
       {
         "handle": 11,
         "port_type": {
+          "hex": "0009",
           "name": "Serial Port 16550A Compatible",
           "value": 9
         },
         "internal_reference_designator": "J2A2A",
         "external_connector_type": {
+          "hex": "0008",
           "name": "DB-9 pin male",
           "value": 8
         },
@@ -3417,11 +2781,13 @@
       {
         "handle": 12,
         "port_type": {
+          "hex": "001c",
           "name": "Video Port",
           "value": 28
         },
         "internal_reference_designator": "J2A2B",
         "external_connector_type": {
+          "hex": "0007",
           "name": "DB-15 pin female",
           "value": 7
         },
@@ -3430,11 +2796,13 @@
       {
         "handle": 13,
         "port_type": {
+          "hex": "0010",
           "name": "USB",
           "value": 16
         },
         "internal_reference_designator": "J3A1",
         "external_connector_type": {
+          "hex": "0012",
           "name": "Access Bus [USB]",
           "value": 18
         },
@@ -3443,11 +2811,13 @@
       {
         "handle": 14,
         "port_type": {
+          "hex": "0010",
           "name": "USB",
           "value": 16
         },
         "internal_reference_designator": "J3A1",
         "external_connector_type": {
+          "hex": "0012",
           "name": "Access Bus [USB]",
           "value": 18
         },
@@ -3456,11 +2826,13 @@
       {
         "handle": 15,
         "port_type": {
+          "hex": "0010",
           "name": "USB",
           "value": 16
         },
         "internal_reference_designator": "J3A1",
         "external_connector_type": {
+          "hex": "0012",
           "name": "Access Bus [USB]",
           "value": 18
         },
@@ -3469,10 +2841,12 @@
       {
         "handle": 16,
         "port_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
         "internal_connector_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
@@ -3481,10 +2855,12 @@
       {
         "handle": 17,
         "port_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
         "internal_connector_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
@@ -3493,10 +2869,12 @@
       {
         "handle": 18,
         "port_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
         "internal_connector_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
@@ -3505,10 +2883,12 @@
       {
         "handle": 19,
         "port_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
         "internal_connector_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
@@ -3517,10 +2897,12 @@
       {
         "handle": 20,
         "port_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
         "internal_connector_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
@@ -3529,10 +2911,12 @@
       {
         "handle": 21,
         "port_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
         "internal_connector_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
@@ -3541,10 +2925,12 @@
       {
         "handle": 22,
         "port_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
         "internal_connector_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
@@ -3553,10 +2939,12 @@
       {
         "handle": 23,
         "port_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
         "internal_connector_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
@@ -3565,10 +2953,12 @@
       {
         "handle": 24,
         "port_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
         "internal_connector_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
@@ -3577,10 +2967,12 @@
       {
         "handle": 25,
         "port_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
         "internal_connector_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
@@ -3589,10 +2981,12 @@
       {
         "handle": 26,
         "port_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
         "internal_connector_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
@@ -3601,10 +2995,12 @@
       {
         "handle": 27,
         "port_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
         "internal_connector_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
@@ -3613,10 +3009,12 @@
       {
         "handle": 28,
         "port_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
         "internal_connector_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
@@ -3625,10 +3023,12 @@
       {
         "handle": 29,
         "port_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
         "internal_connector_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
@@ -3637,10 +3037,12 @@
       {
         "handle": 30,
         "port_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
         "internal_connector_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
@@ -3649,10 +3051,12 @@
       {
         "handle": 31,
         "port_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
         "internal_connector_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
@@ -3664,6 +3068,7 @@
         "handle": 49,
         "socket": "SOCKET 0",
         "socket_type": {
+          "hex": "0001",
           "name": "Other",
           "value": 1
         },
@@ -3672,14 +3077,17 @@
         "version": "Intel(R) Celeron(R) J4105 CPU @ 1.50GHz",
         "part": "Fill By OEM",
         "processor_type": {
+          "hex": "0003",
           "name": "CPU",
           "value": 3
         },
         "processor_family": {
+          "hex": "000f",
           "name": "Celeron",
           "value": 15
         },
         "processor_status": {
+          "hex": "0001",
           "name": "Enabled",
           "value": 1
         },
@@ -3695,18 +3103,22 @@
         "handle": 64,
         "designation": "J7H1",
         "slot_type": {
+          "hex": "00ae",
           "name": "Other",
           "value": 174
         },
         "bus_width": {
+          "hex": "000a",
           "name": "Other",
           "value": 10
         },
         "usage": {
+          "hex": "0004",
           "name": "In Use",
           "value": 4
         },
         "length": {
+          "hex": "0003",
           "name": "Short",
           "value": 3
         },
@@ -3721,18 +3133,22 @@
         "handle": 65,
         "designation": "J8H1",
         "slot_type": {
+          "hex": "00ad",
           "name": "Other",
           "value": 173
         },
         "bus_width": {
+          "hex": "0009",
           "name": "Other",
           "value": 9
         },
         "usage": {
+          "hex": "0003",
           "name": "Available",
           "value": 3
         },
         "length": {
+          "hex": "0003",
           "name": "Short",
           "value": 3
         },
@@ -3750,6 +3166,7 @@
       "product": "MZGLKAP-00",
       "version": "1.x",
       "wake_up": {
+        "hex": "0006",
         "name": "Power Switch",
         "value": 6
       }
diff --git a/machines/blocktech/facter.json b/machines/blocktech/facter.json
index 6fd442c..f57a0e4 100644
--- a/machines/blocktech/facter.json
+++ b/machines/blocktech/facter.json
@@ -23,8 +23,8 @@
     },
     "bluetooth": [
       {
-        "index": 61,
-        "attached_to": 60,
+        "index": 62,
+        "attached_to": 61,
         "class_list": [
           "usb",
           "bluetooth"
@@ -102,8 +102,8 @@
         "module_alias": "usb:v8087p0036d0000dcE0dsc01dp01icE0isc01ip01in00"
       },
       {
-        "index": 67,
-        "attached_to": 60,
+        "index": 68,
+        "attached_to": 61,
         "class_list": [
           "usb",
           "bluetooth"
@@ -255,9 +255,13 @@
           "prog_if": 0
         },
         "driver": "pcieport",
+        "driver_module": "pcieportdrv",
         "drivers": [
           "pcieport"
         ],
+        "driver_modules": [
+          "pcieportdrv"
+        ],
         "module_alias": "pci:v00008086d00007E38sv000017AAsd00002234bc06sc04i00"
       },
       {
@@ -394,9 +398,13 @@
           "prog_if": 0
         },
         "driver": "pcieport",
+        "driver_module": "pcieportdrv",
         "drivers": [
           "pcieport"
         ],
+        "driver_modules": [
+          "pcieportdrv"
+        ],
         "module_alias": "pci:v00008086d00007ECCsv000017AAsd00002234bc06sc04i00"
       },
       {
@@ -472,9 +480,13 @@
           "prog_if": 0
         },
         "driver": "pcieport",
+        "driver_module": "pcieportdrv",
         "drivers": [
           "pcieport"
         ],
+        "driver_modules": [
+          "pcieportdrv"
+        ],
         "module_alias": "pci:v00008086d00007E3Fsv000017AAsd00002234bc06sc04i00"
       },
       {
@@ -550,9 +562,13 @@
           "prog_if": 0
         },
         "driver": "pcieport",
+        "driver_module": "pcieportdrv",
         "drivers": [
           "pcieport"
         ],
+        "driver_modules": [
+          "pcieportdrv"
+        ],
         "module_alias": "pci:v00008086d00007EC4sv000017AAsd00002234bc06sc04i00"
       },
       {
@@ -614,6 +630,14 @@
           "irq": 0,
           "prog_if": 0
         },
+        "driver": "igen6_edac",
+        "driver_module": "igen6_edac",
+        "drivers": [
+          "igen6_edac"
+        ],
+        "driver_modules": [
+          "igen6_edac"
+        ],
         "module_alias": "pci:v00008086d00007D01sv000017AAsd00002234bc06sc00i00"
       },
       {
@@ -689,9 +713,13 @@
           "prog_if": 0
         },
         "driver": "pcieport",
+        "driver_module": "pcieportdrv",
         "drivers": [
           "pcieport"
         ],
+        "driver_modules": [
+          "pcieportdrv"
+        ],
         "module_alias": "pci:v00008086d00007ECBsv000017AAsd00002234bc06sc04i00"
       },
       {
@@ -767,9 +795,13 @@
           "prog_if": 0
         },
         "driver": "pcieport",
+        "driver_module": "pcieportdrv",
         "drivers": [
           "pcieport"
         ],
+        "driver_modules": [
+          "pcieportdrv"
+        ],
         "module_alias": "pci:v00008086d00007E4Dsv000017AAsd00002234bc06sc04i00"
       },
       {
@@ -845,16 +877,20 @@
           "prog_if": 0
         },
         "driver": "pcieport",
+        "driver_module": "pcieportdrv",
         "drivers": [
           "pcieport"
         ],
+        "driver_modules": [
+          "pcieportdrv"
+        ],
         "module_alias": "pci:v00008086d00007EC5sv000017AAsd00002234bc06sc04i00"
       }
     ],
     "camera": [
       {
-        "index": 58,
-        "attached_to": 60,
+        "index": 59,
+        "attached_to": 61,
         "class_list": [
           "camera",
           "usb"
@@ -955,8 +991,8 @@
         "module_alias": "usb:v30C9p00CDd1008dcEFdsc02dp01ic0Eisc02ip01in01"
       },
       {
-        "index": 63,
-        "attached_to": 60,
+        "index": 64,
+        "attached_to": 61,
         "class_list": [
           "camera",
           "usb"
@@ -1057,8 +1093,8 @@
         "module_alias": "usb:v30C9p00CDd1008dcEFdsc02dp01ic0Eisc01ip01in02"
       },
       {
-        "index": 65,
-        "attached_to": 60,
+        "index": 66,
+        "attached_to": 61,
         "class_list": [
           "camera",
           "usb"
@@ -1159,8 +1195,8 @@
         "module_alias": "usb:v30C9p00CDd1008dcEFdsc02dp01ic0Eisc01ip01in00"
       },
       {
-        "index": 68,
-        "attached_to": 60,
+        "index": 69,
+        "attached_to": 61,
         "class_list": [
           "camera",
           "usb"
@@ -1265,6 +1301,7 @@
       {
         "architecture": "x86_64",
         "vendor_name": "GenuineIntel",
+        "model_name": "Intel(R) Core(TM) Ultra 7 155H",
         "family": 6,
         "model": 170,
         "stepping": 4,
@@ -1346,7 +1383,6 @@
           "3dnowprefetch",
           "cpuid_fault",
           "epb",
-          "intel_ppin",
           "ssbd",
           "ibrs",
           "ibpb",
@@ -1417,114 +1453,28 @@
           "swapgs",
           "bhi"
         ],
+        "power_management": [
+          ""
+        ],
         "bogo": 5990.4,
         "cache": 2048,
         "units": 128,
         "physical_id": 0,
         "siblings": 22,
         "cores": 16,
-        "fpu": true,
-        "fpu_exception": true,
+        "fpu": false,
+        "fpu_exception": false,
         "cpuid_level": 35,
         "write_protect": false,
         "clflush_size": 64,
         "cache_alignment": 64,
         "address_sizes": {
-          "physical": 46,
-          "virtual": 48
+          "physical": "0x2e",
+          "virtual": "0x30"
         }
       }
     ],
     "disk": [
-      {
-        "index": 56,
-        "attached_to": 50,
-        "class_list": [
-          "disk",
-          "block_device",
-          "nvme"
-        ],
-        "bus_type": {
-          "hex": "0096",
-          "name": "NVME",
-          "value": 150
-        },
-        "slot": {
-          "bus": 0,
-          "number": 0
-        },
-        "base_class": {
-          "hex": "0106",
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "hex": "0000",
-          "name": "Disk",
-          "value": 0
-        },
-        "vendor": {
-          "hex": "1e0f",
-          "value": 7695
-        },
-        "sub_vendor": {
-          "hex": "1e0f",
-          "value": 7695
-        },
-        "device": {
-          "hex": "0010",
-          "name": "KXG8AZNV1T02 LA KIOXIA",
-          "value": 16
-        },
-        "sub_device": {
-          "hex": "0001",
-          "value": 1
-        },
-        "serial": "54BF71ZZFG6P",
-        "model": "KXG8AZNV1T02 LA KIOXIA",
-        "sysfs_id": "/class/block/nvme0n1",
-        "sysfs_bus_id": "nvme0",
-        "sysfs_device_link": "/devices/pci0000:00/0000:00:06.0/0000:04:00.0/nvme/nvme0",
-        "unix_device_name": "/dev/nvme0n1",
-        "unix_device_number": {
-          "type": 98,
-          "major": 259,
-          "minor": 0,
-          "range": 0
-        },
-        "unix_device_names": [
-          "/dev/disk/by-diskseq/1",
-          "/dev/disk/by-id/nvme-KXG8AZNV1T02_LA_KIOXIA_54BF71ZZFG6P",
-          "/dev/disk/by-id/nvme-KXG8AZNV1T02_LA_KIOXIA_54BF71ZZFG6P_1",
-          "/dev/disk/by-id/nvme-eui.8ce38e05011f5d69",
-          "/dev/disk/by-path/pci-0000:04:00.0-nvme-1",
-          "/dev/nvme0n1"
-        ],
-        "resources": [
-          {
-            "type": "disk_geo",
-            "cylinders": 976762,
-            "heads": 64,
-            "sectors": 32,
-            "size": 0,
-            "geo_type": "logical"
-          },
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 2000409264,
-            "value_2": 512
-          }
-        ],
-        "driver": "nvme",
-        "driver_module": "nvme",
-        "drivers": [
-          "nvme"
-        ],
-        "driver_modules": [
-          "nvme"
-        ]
-      },
       {
         "index": 57,
         "attached_to": 47,
@@ -1540,7 +1490,7 @@
         },
         "slot": {
           "bus": 0,
-          "number": 1
+          "number": 0
         },
         "base_class": {
           "hex": "0106",
@@ -1571,10 +1521,10 @@
         },
         "serial": "50026B73831D4D6A",
         "model": "KINGSTON SNV3S1000G",
-        "sysfs_id": "/class/block/nvme1n1",
-        "sysfs_bus_id": "nvme1",
-        "sysfs_device_link": "/devices/pci0000:00/0000:00:06.2/0000:05:00.0/nvme/nvme1",
-        "unix_device_name": "/dev/nvme1n1",
+        "sysfs_id": "/class/block/nvme0n1",
+        "sysfs_bus_id": "nvme0",
+        "sysfs_device_link": "/devices/pci0000:00/0000:00:06.2/0000:05:00.0/nvme/nvme0",
+        "unix_device_name": "/dev/nvme0n1",
         "unix_device_number": {
           "type": 98,
           "major": 259,
@@ -1582,12 +1532,11 @@
           "range": 0
         },
         "unix_device_names": [
-          "/dev/disk/by-diskseq/2",
           "/dev/disk/by-id/nvme-KINGSTON_SNV3S1000G_50026B73831D4D6A",
           "/dev/disk/by-id/nvme-KINGSTON_SNV3S1000G_50026B73831D4D6A_1",
           "/dev/disk/by-id/nvme-eui.00000000000000000026b73831d4d6a5",
           "/dev/disk/by-path/pci-0000:05:00.0-nvme-1",
-          "/dev/nvme1n1"
+          "/dev/nvme0n1"
         ],
         "resources": [
           {
@@ -1595,7 +1544,7 @@
             "cylinders": 953869,
             "heads": 64,
             "sectors": 32,
-            "size": 0,
+            "size": "0x0",
             "geo_type": "logical"
           },
           {
@@ -1613,6 +1562,94 @@
         "driver_modules": [
           "nvme"
         ]
+      },
+      {
+        "index": 58,
+        "attached_to": 50,
+        "class_list": [
+          "disk",
+          "block_device",
+          "nvme"
+        ],
+        "bus_type": {
+          "hex": "0096",
+          "name": "NVME",
+          "value": 150
+        },
+        "slot": {
+          "bus": 0,
+          "number": 1
+        },
+        "base_class": {
+          "hex": "0106",
+          "name": "Mass Storage Device",
+          "value": 262
+        },
+        "sub_class": {
+          "hex": "0000",
+          "name": "Disk",
+          "value": 0
+        },
+        "vendor": {
+          "hex": "1e0f",
+          "value": 7695
+        },
+        "sub_vendor": {
+          "hex": "1e0f",
+          "value": 7695
+        },
+        "device": {
+          "hex": "0010",
+          "name": "KXG8AZNV1T02 LA KIOXIA",
+          "value": 16
+        },
+        "sub_device": {
+          "hex": "0001",
+          "value": 1
+        },
+        "serial": "54BF71ZZFG6P",
+        "model": "KXG8AZNV1T02 LA KIOXIA",
+        "sysfs_id": "/class/block/nvme1n1",
+        "sysfs_bus_id": "nvme1",
+        "sysfs_device_link": "/devices/pci0000:00/0000:00:06.0/0000:04:00.0/nvme/nvme1",
+        "unix_device_name": "/dev/nvme1n1",
+        "unix_device_number": {
+          "type": 98,
+          "major": 259,
+          "minor": 0,
+          "range": 0
+        },
+        "unix_device_names": [
+          "/dev/disk/by-id/nvme-KXG8AZNV1T02_LA_KIOXIA_54BF71ZZFG6P",
+          "/dev/disk/by-id/nvme-KXG8AZNV1T02_LA_KIOXIA_54BF71ZZFG6P_1",
+          "/dev/disk/by-id/nvme-eui.8ce38e05011f5d69",
+          "/dev/disk/by-path/pci-0000:04:00.0-nvme-1",
+          "/dev/nvme1n1"
+        ],
+        "resources": [
+          {
+            "type": "disk_geo",
+            "cylinders": 976762,
+            "heads": 64,
+            "sectors": 32,
+            "size": "0x0",
+            "geo_type": "logical"
+          },
+          {
+            "type": "size",
+            "unit": "sectors",
+            "value_1": 2000409264,
+            "value_2": 512
+          }
+        ],
+        "driver": "nvme",
+        "driver_module": "nvme",
+        "drivers": [
+          "nvme"
+        ],
+        "driver_modules": [
+          "nvme"
+        ]
       }
     ],
     "graphics_card": [
@@ -1677,7 +1714,7 @@
           },
           {
             "type": "irq",
-            "base": 16,
+            "base": 229,
             "triggered": 0,
             "enabled": true
           },
@@ -1708,12 +1745,20 @@
         ],
         "detail": {
           "function": 0,
-          "command": 3,
+          "command": 1031,
           "header_type": 0,
           "secondary_bus": 0,
-          "irq": 16,
+          "irq": 229,
           "prog_if": 0
         },
+        "driver": "nouveau",
+        "driver_module": "nouveau",
+        "drivers": [
+          "nouveau"
+        ],
+        "driver_modules": [
+          "nouveau"
+        ],
         "module_alias": "pci:v000010DEd000028B9sv000017AAsd00002234bc03sc02i00"
       },
       {
@@ -1773,6 +1818,12 @@
         "sysfs_bus_id": "0000:00:02.0",
         "sysfs_iommu_group_id": 0,
         "resources": [
+          {
+            "type": "irq",
+            "base": 227,
+            "triggered": 0,
+            "enabled": true
+          },
           {
             "type": "mem",
             "base": 283736276992,
@@ -1803,15 +1854,23 @@
           "command": 7,
           "header_type": 0,
           "secondary_bus": 0,
-          "irq": 0,
+          "irq": 227,
           "prog_if": 0
         },
+        "driver": "i915",
+        "driver_module": "i915",
+        "drivers": [
+          "i915"
+        ],
+        "driver_modules": [
+          "i915"
+        ],
         "module_alias": "pci:v00008086d00007D55sv000017AAsd00002234bc03sc00i00"
       }
     ],
     "hub": [
       {
-        "index": 60,
+        "index": 61,
         "attached_to": 52,
         "class_list": [
           "usb",
@@ -1833,7 +1892,7 @@
         },
         "vendor": {
           "hex": "1d6b",
-          "name": "Linux 6.6.57 xhci-hcd",
+          "name": "Linux 6.14.8 xhci-hcd",
           "value": 7531
         },
         "device": {
@@ -1843,11 +1902,11 @@
         },
         "revision": {
           "hex": "0000",
-          "name": "6.06",
+          "name": "6.14",
           "value": 0
         },
         "serial": "0000:00:14.0",
-        "model": "Linux 6.6.57 xhci-hcd xHCI Host Controller",
+        "model": "Linux 6.14.8 xhci-hcd xHCI Host Controller",
         "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-0:1.0",
         "sysfs_bus_id": "3-0:1.0",
         "resources": [
@@ -1888,13 +1947,17 @@
         },
         "hotplug": "usb",
         "driver": "hub",
+        "driver_module": "usbcore",
         "drivers": [
           "hub"
         ],
-        "module_alias": "usb:v1D6Bp0002d0606dc09dsc00dp01ic09isc00ip00in00"
+        "driver_modules": [
+          "usbcore"
+        ],
+        "module_alias": "usb:v1D6Bp0002d0614dc09dsc00dp01ic09isc00ip00in00"
       },
       {
-        "index": 64,
+        "index": 65,
         "attached_to": 52,
         "class_list": [
           "usb",
@@ -1916,7 +1979,7 @@
         },
         "vendor": {
           "hex": "1d6b",
-          "name": "Linux 6.6.57 xhci-hcd",
+          "name": "Linux 6.14.8 xhci-hcd",
           "value": 7531
         },
         "device": {
@@ -1926,11 +1989,11 @@
         },
         "revision": {
           "hex": "0000",
-          "name": "6.06",
+          "name": "6.14",
           "value": 0
         },
         "serial": "0000:00:14.0",
-        "model": "Linux 6.6.57 xhci-hcd xHCI Host Controller",
+        "model": "Linux 6.14.8 xhci-hcd xHCI Host Controller",
         "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb4/4-0:1.0",
         "sysfs_bus_id": "4-0:1.0",
         "detail": {
@@ -1961,13 +2024,17 @@
         },
         "hotplug": "usb",
         "driver": "hub",
+        "driver_module": "usbcore",
         "drivers": [
           "hub"
         ],
-        "module_alias": "usb:v1D6Bp0003d0606dc09dsc00dp03ic09isc00ip00in00"
+        "driver_modules": [
+          "usbcore"
+        ],
+        "module_alias": "usb:v1D6Bp0003d0614dc09dsc00dp03ic09isc00ip00in00"
       },
       {
-        "index": 66,
+        "index": 67,
         "attached_to": 29,
         "class_list": [
           "usb",
@@ -1989,7 +2056,7 @@
         },
         "vendor": {
           "hex": "1d6b",
-          "name": "Linux 6.6.57 xhci-hcd",
+          "name": "Linux 6.14.8 xhci-hcd",
           "value": 7531
         },
         "device": {
@@ -1999,11 +2066,11 @@
         },
         "revision": {
           "hex": "0000",
-          "name": "6.06",
+          "name": "6.14",
           "value": 0
         },
         "serial": "0000:00:0d.0",
-        "model": "Linux 6.6.57 xhci-hcd xHCI Host Controller",
+        "model": "Linux 6.14.8 xhci-hcd xHCI Host Controller",
         "sysfs_id": "/devices/pci0000:00/0000:00:0d.0/usb1/1-0:1.0",
         "sysfs_bus_id": "1-0:1.0",
         "resources": [
@@ -2044,13 +2111,17 @@
         },
         "hotplug": "usb",
         "driver": "hub",
+        "driver_module": "usbcore",
         "drivers": [
           "hub"
         ],
-        "module_alias": "usb:v1D6Bp0002d0606dc09dsc00dp01ic09isc00ip00in00"
+        "driver_modules": [
+          "usbcore"
+        ],
+        "module_alias": "usb:v1D6Bp0002d0614dc09dsc00dp01ic09isc00ip00in00"
       },
       {
-        "index": 69,
+        "index": 70,
         "attached_to": 29,
         "class_list": [
           "usb",
@@ -2072,7 +2143,7 @@
         },
         "vendor": {
           "hex": "1d6b",
-          "name": "Linux 6.6.57 xhci-hcd",
+          "name": "Linux 6.14.8 xhci-hcd",
           "value": 7531
         },
         "device": {
@@ -2082,11 +2153,11 @@
         },
         "revision": {
           "hex": "0000",
-          "name": "6.06",
+          "name": "6.14",
           "value": 0
         },
         "serial": "0000:00:0d.0",
-        "model": "Linux 6.6.57 xhci-hcd xHCI Host Controller",
+        "model": "Linux 6.14.8 xhci-hcd xHCI Host Controller",
         "sysfs_id": "/devices/pci0000:00/0000:00:0d.0/usb2/2-0:1.0",
         "sysfs_bus_id": "2-0:1.0",
         "detail": {
@@ -2117,10 +2188,14 @@
         },
         "hotplug": "usb",
         "driver": "hub",
+        "driver_module": "usbcore",
         "drivers": [
           "hub"
         ],
-        "module_alias": "usb:v1D6Bp0003d0606dc09dsc00dp03ic09isc00ip00in00"
+        "driver_modules": [
+          "usbcore"
+        ],
+        "module_alias": "usb:v1D6Bp0003d0614dc09dsc00dp03ic09isc00ip00in00"
       }
     ],
     "memory": [
@@ -2145,7 +2220,7 @@
           {
             "type": "mem",
             "base": 0,
-            "range": 66903273472,
+            "range": 66895929344,
             "enabled": true,
             "access": "read_write",
             "prefetch": "unknown"
@@ -2157,9 +2232,87 @@
         ]
       }
     ],
+    "monitor": [
+      {
+        "index": 56,
+        "attached_to": 51,
+        "class_list": [
+          "monitor"
+        ],
+        "base_class": {
+          "hex": "0100",
+          "name": "Monitor",
+          "value": 256
+        },
+        "sub_class": {
+          "hex": "0002",
+          "name": "LCD Monitor",
+          "value": 2
+        },
+        "vendor": {
+          "hex": "4c83",
+          "name": "SDC",
+          "value": 19587
+        },
+        "device": {
+          "hex": "4165",
+          "value": 16741
+        },
+        "serial": "0",
+        "model": "SDC LCD Monitor",
+        "resources": [
+          {
+            "type": "monitor",
+            "width": 3840,
+            "height": 2400,
+            "vertical_frequency": 60,
+            "interlaced": false
+          },
+          {
+            "type": "size",
+            "unit": "mm",
+            "value_1": 344,
+            "value_2": 215
+          }
+        ],
+        "detail": {
+          "manufacture_year": 2021,
+          "manufacture_week": 0,
+          "vertical_sync": {
+            "min": 0,
+            "max": 0
+          },
+          "horizontal_sync": {
+            "min": 0,
+            "max": 0
+          },
+          "horizontal_sync_timings": {
+            "disp": 3840,
+            "sync_start": 3872,
+            "sync_end": 3880,
+            "total": 3920
+          },
+          "vertical_sync_timings": {
+            "disp": 2400,
+            "sync_start": 2408,
+            "sync_end": 2416,
+            "total": 2432
+          },
+          "clock": 572010,
+          "width": 3840,
+          "height": 2400,
+          "width_millimetres": 344,
+          "height_millimetres": 215,
+          "horizontal_flag": 45,
+          "vertical_flag": 43,
+          "vendor": "SDC",
+          "name": ""
+        }
+      }
+    ],
     "mouse": [
       {
-        "index": 72,
+        "index": 75,
         "attached_to": 0,
         "bus_type": {
           "hex": "0081",
@@ -2184,9 +2337,9 @@
           "hex": "002d",
           "value": 45
         },
-        "sysfs_id": "/devices/pci0000:00/0000:00:15.0/i2c_designware.0/i2c-1/i2c-SNSL002D:00/0018:2C2F:002D.0002/input/input19",
+        "sysfs_id": "/devices/pci0000:00/0000:00:15.0/i2c_designware.0/i2c-1/i2c-SNSL002D:00/0018:2C2F:002D.0001/input/input16",
         "unix_device_names": [
-          "/dev/input/event8",
+          "/dev/input/event11",
           "/dev/input/ + handler"
         ]
       }
@@ -2293,30 +2446,7 @@
     ],
     "network_interface": [
       {
-        "index": 70,
-        "attached_to": 0,
-        "class_list": [
-          "network_interface"
-        ],
-        "base_class": {
-          "hex": "0107",
-          "name": "Network Interface",
-          "value": 263
-        },
-        "sub_class": {
-          "hex": "0000",
-          "name": "Loopback",
-          "value": 0
-        },
-        "model": "Loopback network interface",
-        "sysfs_id": "/class/net/lo",
-        "unix_device_name": "lo",
-        "unix_device_names": [
-          "lo"
-        ]
-      },
-      {
-        "index": 71,
+        "index": 73,
         "attached_to": 28,
         "class_list": [
           "network_interface"
@@ -2356,6 +2486,29 @@
         "driver_modules": [
           "iwlwifi"
         ]
+      },
+      {
+        "index": 74,
+        "attached_to": 0,
+        "class_list": [
+          "network_interface"
+        ],
+        "base_class": {
+          "hex": "0107",
+          "name": "Network Interface",
+          "value": 263
+        },
+        "sub_class": {
+          "hex": "0000",
+          "name": "Loopback",
+          "value": 0
+        },
+        "model": "Loopback network interface",
+        "sysfs_id": "/class/net/lo",
+        "unix_device_name": "lo",
+        "unix_device_names": [
+          "lo"
+        ]
       }
     ],
     "pci": [
@@ -2574,7 +2727,7 @@
         "resources": [
           {
             "type": "irq",
-            "base": 196,
+            "base": 16,
             "triggered": 0,
             "enabled": true
           },
@@ -2589,10 +2742,10 @@
         ],
         "detail": {
           "function": 0,
-          "command": 1030,
+          "command": 6,
           "header_type": 0,
           "secondary_bus": 0,
-          "irq": 196,
+          "irq": 16,
           "prog_if": 0
         },
         "driver": "proc_thermal_pci",
@@ -2659,7 +2812,7 @@
         "resources": [
           {
             "type": "irq",
-            "base": 194,
+            "base": 209,
             "triggered": 0,
             "enabled": true
           },
@@ -2677,7 +2830,7 @@
           "command": 1030,
           "header_type": 0,
           "secondary_bus": 0,
-          "irq": 194,
+          "irq": 209,
           "prog_if": 0
         },
         "driver": "mei_me",
@@ -2738,7 +2891,7 @@
         "resources": [
           {
             "type": "irq",
-            "base": 129,
+            "base": 207,
             "triggered": 0,
             "enabled": true
           },
@@ -2756,7 +2909,7 @@
           "command": 1030,
           "header_type": 0,
           "secondary_bus": 0,
-          "irq": 129,
+          "irq": 207,
           "prog_if": 0
         },
         "driver": "rtsx_pci",
@@ -3061,6 +3214,12 @@
         "sysfs_bus_id": "0000:00:0b.0",
         "sysfs_iommu_group_id": 10,
         "resources": [
+          {
+            "type": "irq",
+            "base": 208,
+            "triggered": 0,
+            "enabled": true
+          },
           {
             "type": "mem",
             "base": 285078454272,
@@ -3080,12 +3239,20 @@
         ],
         "detail": {
           "function": 0,
-          "command": 2,
+          "command": 1030,
           "header_type": 0,
           "secondary_bus": 0,
-          "irq": 0,
+          "irq": 208,
           "prog_if": 0
         },
+        "driver": "intel_vpu",
+        "driver_module": "intel_vpu",
+        "drivers": [
+          "intel_vpu"
+        ],
+        "driver_modules": [
+          "intel_vpu"
+        ],
         "module_alias": "pci:v00008086d00007D1Dsv000017AAsd00002234bc12sc00i00"
       },
       {
@@ -3397,7 +3564,7 @@
         "resources": [
           {
             "type": "irq",
-            "base": 213,
+            "base": 228,
             "triggered": 0,
             "enabled": true
           },
@@ -3423,7 +3590,7 @@
           "command": 1030,
           "header_type": 0,
           "secondary_bus": 0,
-          "irq": 213,
+          "irq": 228,
           "prog_if": 128
         },
         "driver": "sof-audio-pci-intel-mtl",
@@ -3618,8 +3785,8 @@
     },
     "usb": [
       {
-        "index": 59,
-        "attached_to": 60,
+        "index": 60,
+        "attached_to": 61,
         "class_list": [
           "usb",
           "unknown"
@@ -3702,8 +3869,8 @@
         "module_alias": "usb:v27C6p6594d0100dcEFdsc00dp00icFFisc00ip00in00"
       },
       {
-        "index": 62,
-        "attached_to": 60,
+        "index": 63,
+        "attached_to": 61,
         "class_list": [
           "usb",
           "unknown"
@@ -3860,7 +4027,7 @@
         "resources": [
           {
             "type": "irq",
-            "base": 130,
+            "base": 145,
             "triggered": 0,
             "enabled": true
           },
@@ -3878,7 +4045,7 @@
           "command": 1030,
           "header_type": 0,
           "secondary_bus": 0,
-          "irq": 130,
+          "irq": 145,
           "prog_if": 48
         },
         "driver": "xhci_hcd",
@@ -3949,7 +4116,7 @@
         "resources": [
           {
             "type": "irq",
-            "base": 149,
+            "base": 155,
             "triggered": 0,
             "enabled": true
           },
@@ -3964,10 +4131,10 @@
         ],
         "detail": {
           "function": 0,
-          "command": 1030,
+          "command": 1026,
           "header_type": 0,
           "secondary_bus": 0,
-          "irq": 149,
+          "irq": 155,
           "prog_if": 48
         },
         "driver": "xhci_hcd",
@@ -4453,38 +4620,40 @@
         ]
       }
     ],
-    "chassis": {
-      "handle": 31,
-      "manufacturer": "LENOVO",
-      "version": "None",
-      "chassis_type": {
-        "hex": "000a",
-        "name": "Notebook",
-        "value": 10
-      },
-      "lock_present": false,
-      "bootup_state": {
-        "hex": "0002",
-        "name": "Unknown",
-        "value": 2
-      },
-      "power_state": {
-        "hex": "0002",
-        "name": "Unknown",
-        "value": 2
-      },
-      "thermal_state": {
-        "hex": "0002",
-        "name": "Unknown",
-        "value": 2
-      },
-      "security_state": {
-        "hex": "0002",
-        "name": "Unknown",
-        "value": 2
-      },
-      "oem": "0x0"
-    },
+    "chassis": [
+      {
+        "handle": 31,
+        "manufacturer": "LENOVO",
+        "version": "None",
+        "chassis_type": {
+          "hex": "000a",
+          "name": "Notebook",
+          "value": 10
+        },
+        "lock_present": false,
+        "bootup_state": {
+          "hex": "0002",
+          "name": "Unknown",
+          "value": 2
+        },
+        "power_state": {
+          "hex": "0002",
+          "name": "Unknown",
+          "value": 2
+        },
+        "thermal_state": {
+          "hex": "0002",
+          "name": "Unknown",
+          "value": 2
+        },
+        "security_state": {
+          "hex": "0002",
+          "name": "Unknown",
+          "value": 2
+        },
+        "oem": "0x0"
+      }
+    ],
     "config": {
       "handle": 49
     },
@@ -4546,7 +4715,7 @@
           "name": "None",
           "value": 3
         },
-        "max_size": 67108864,
+        "max_size": "0x4000000",
         "error_handle": 65534,
         "slots": 8
       }
@@ -4555,8 +4724,8 @@
       {
         "handle": 12,
         "array_handle": 3,
-        "start_address": 0,
-        "end_address": 68719476736,
+        "start_address": "0x0",
+        "end_address": "0x1000000000",
         "part_width": 8
       }
     ],
@@ -4797,8 +4966,8 @@
           "value": 2
         },
         "syndrome": 0,
-        "array_address": 2147483648,
-        "device_address": 2147483648,
+        "array_address": "0x80000000",
+        "device_address": "0x80000000",
         "range": 2147483648
       }
     ],
diff --git a/machines/jefke/facter.json b/machines/jefke/facter.json
index c38ac98..626d5db 100644
--- a/machines/jefke/facter.json
+++ b/machines/jefke/facter.json
@@ -23,9 +23,14 @@
     },
     "bluetooth": [
       {
-        "index": 42,
-        "attached_to": 43,
+        "index": 26,
+        "attached_to": 27,
+        "class_list": [
+          "usb",
+          "bluetooth"
+        ],
         "bus_type": {
+          "hex": "0086",
           "name": "USB",
           "value": 134
         },
@@ -34,16 +39,20 @@
           "number": 0
         },
         "base_class": {
+          "hex": "0115",
           "name": "Bluetooth Device",
           "value": 277
         },
         "vendor": {
+          "hex": "8087",
           "value": 32903
         },
         "device": {
+          "hex": "0aa7",
           "value": 2727
         },
         "revision": {
+          "hex": "0000",
           "name": "0.01",
           "value": 0
         },
@@ -62,19 +71,23 @@
         ],
         "detail": {
           "device_class": {
+            "hex": "00e0",
             "name": "wireless",
             "value": 224
           },
           "device_subclass": {
+            "hex": "0001",
             "name": "audio",
             "value": 1
           },
           "device_protocol": 1,
           "interface_class": {
+            "hex": "00e0",
             "name": "wireless",
             "value": 224
           },
           "interface_subclass": {
+            "hex": "0001",
             "name": "audio",
             "value": 1
           },
@@ -94,9 +107,14 @@
         "module_alias": "usb:v8087p0AA7d0001dcE0dsc01dp01icE0isc01ip01in00"
       },
       {
-        "index": 44,
-        "attached_to": 43,
+        "index": 28,
+        "attached_to": 27,
+        "class_list": [
+          "usb",
+          "bluetooth"
+        ],
         "bus_type": {
+          "hex": "0086",
           "name": "USB",
           "value": 134
         },
@@ -105,16 +123,20 @@
           "number": 0
         },
         "base_class": {
+          "hex": "0115",
           "name": "Bluetooth Device",
           "value": 277
         },
         "vendor": {
+          "hex": "8087",
           "value": 32903
         },
         "device": {
+          "hex": "0aa7",
           "value": 2727
         },
         "revision": {
+          "hex": "0000",
           "name": "0.01",
           "value": 0
         },
@@ -133,19 +155,23 @@
         ],
         "detail": {
           "device_class": {
+            "hex": "00e0",
             "name": "wireless",
             "value": 224
           },
           "device_subclass": {
+            "hex": "0001",
             "name": "audio",
             "value": 1
           },
           "device_protocol": 1,
           "interface_class": {
+            "hex": "00e0",
             "name": "wireless",
             "value": 224
           },
           "interface_subclass": {
+            "hex": "0001",
             "name": "audio",
             "value": 1
           },
@@ -169,7 +195,12 @@
       {
         "index": 10,
         "attached_to": 0,
+        "class_list": [
+          "pci",
+          "bridge"
+        ],
         "bus_type": {
+          "hex": "0004",
           "name": "PCI",
           "value": 4
         },
@@ -178,27 +209,34 @@
           "number": 31
         },
         "base_class": {
+          "hex": "0006",
           "name": "Bridge",
           "value": 6
         },
         "sub_class": {
+          "hex": "0001",
           "name": "ISA bridge",
           "value": 1
         },
         "vendor": {
+          "hex": "8086",
           "name": "Intel Corporation",
           "value": 32902
         },
         "sub_vendor": {
+          "hex": "1458",
           "value": 5208
         },
         "device": {
+          "hex": "31e8",
           "value": 12776
         },
         "sub_device": {
+          "hex": "1000",
           "value": 4096
         },
         "revision": {
+          "hex": "0003",
           "value": 3
         },
         "model": "Intel ISA bridge",
@@ -212,13 +250,26 @@
           "irq": 0,
           "prog_if": 0
         },
+        "driver": "lpc_ich",
+        "driver_module": "lpc_ich",
+        "drivers": [
+          "lpc_ich"
+        ],
+        "driver_modules": [
+          "lpc_ich"
+        ],
         "module_alias": "pci:v00008086d000031E8sv00001458sd00001000bc06sc01i00",
         "label": "Onboard - Other"
       },
       {
         "index": 11,
         "attached_to": 0,
+        "class_list": [
+          "pci",
+          "bridge"
+        ],
         "bus_type": {
+          "hex": "0004",
           "name": "PCI",
           "value": 4
         },
@@ -227,31 +278,39 @@
           "number": 19
         },
         "base_class": {
+          "hex": "0006",
           "name": "Bridge",
           "value": 6
         },
         "sub_class": {
+          "hex": "0004",
           "name": "PCI bridge",
           "value": 4
         },
         "pci_interface": {
+          "hex": "0000",
           "name": "Normal decode",
           "value": 0
         },
         "vendor": {
+          "hex": "8086",
           "name": "Intel Corporation",
           "value": 32902
         },
         "sub_vendor": {
+          "hex": "1458",
           "value": 5208
         },
         "device": {
+          "hex": "31da",
           "value": 12762
         },
         "sub_device": {
+          "hex": "1000",
           "value": 4096
         },
         "revision": {
+          "hex": "00f3",
           "value": 243
         },
         "model": "Intel PCI bridge",
@@ -260,7 +319,7 @@
         "resources": [
           {
             "type": "irq",
-            "base": 123,
+            "base": 121,
             "triggered": 0,
             "enabled": true
           }
@@ -270,19 +329,28 @@
           "command": 1031,
           "header_type": 1,
           "secondary_bus": 2,
-          "irq": 123,
+          "irq": 121,
           "prog_if": 0
         },
         "driver": "pcieport",
+        "driver_module": "pcieportdrv",
         "drivers": [
           "pcieport"
         ],
+        "driver_modules": [
+          "pcieportdrv"
+        ],
         "module_alias": "pci:v00008086d000031DAsv00001458sd00001000bc06sc04i00"
       },
       {
         "index": 13,
         "attached_to": 0,
+        "class_list": [
+          "pci",
+          "bridge"
+        ],
         "bus_type": {
+          "hex": "0004",
           "name": "PCI",
           "value": 4
         },
@@ -291,31 +359,39 @@
           "number": 19
         },
         "base_class": {
+          "hex": "0006",
           "name": "Bridge",
           "value": 6
         },
         "sub_class": {
+          "hex": "0004",
           "name": "PCI bridge",
           "value": 4
         },
         "pci_interface": {
+          "hex": "0000",
           "name": "Normal decode",
           "value": 0
         },
         "vendor": {
+          "hex": "8086",
           "name": "Intel Corporation",
           "value": 32902
         },
         "sub_vendor": {
+          "hex": "1458",
           "value": 5208
         },
         "device": {
+          "hex": "31d8",
           "value": 12760
         },
         "sub_device": {
+          "hex": "1000",
           "value": 4096
         },
         "revision": {
+          "hex": "00f3",
           "value": 243
         },
         "model": "Intel PCI bridge",
@@ -324,7 +400,7 @@
         "resources": [
           {
             "type": "irq",
-            "base": 122,
+            "base": 120,
             "triggered": 0,
             "enabled": true
           }
@@ -334,19 +410,28 @@
           "command": 1031,
           "header_type": 1,
           "secondary_bus": 1,
-          "irq": 122,
+          "irq": 120,
           "prog_if": 0
         },
         "driver": "pcieport",
+        "driver_module": "pcieportdrv",
         "drivers": [
           "pcieport"
         ],
+        "driver_modules": [
+          "pcieportdrv"
+        ],
         "module_alias": "pci:v00008086d000031D8sv00001458sd00001000bc06sc04i00"
       },
       {
         "index": 17,
         "attached_to": 0,
+        "class_list": [
+          "pci",
+          "bridge"
+        ],
         "bus_type": {
+          "hex": "0004",
           "name": "PCI",
           "value": 4
         },
@@ -355,27 +440,34 @@
           "number": 0
         },
         "base_class": {
+          "hex": "0006",
           "name": "Bridge",
           "value": 6
         },
         "sub_class": {
+          "hex": "0000",
           "name": "Host bridge",
           "value": 0
         },
         "vendor": {
+          "hex": "8086",
           "name": "Intel Corporation",
           "value": 32902
         },
         "sub_vendor": {
+          "hex": "1458",
           "value": 5208
         },
         "device": {
+          "hex": "31f0",
           "value": 12784
         },
         "sub_device": {
+          "hex": "1000",
           "value": 4096
         },
         "revision": {
+          "hex": "0003",
           "value": 3
         },
         "model": "Intel Host bridge",
@@ -395,7 +487,12 @@
       {
         "index": 20,
         "attached_to": 0,
+        "class_list": [
+          "pci",
+          "bridge"
+        ],
         "bus_type": {
+          "hex": "0004",
           "name": "PCI",
           "value": 4
         },
@@ -404,31 +501,39 @@
           "number": 19
         },
         "base_class": {
+          "hex": "0006",
           "name": "Bridge",
           "value": 6
         },
         "sub_class": {
+          "hex": "0004",
           "name": "PCI bridge",
           "value": 4
         },
         "pci_interface": {
+          "hex": "0000",
           "name": "Normal decode",
           "value": 0
         },
         "vendor": {
+          "hex": "8086",
           "name": "Intel Corporation",
           "value": 32902
         },
         "sub_vendor": {
+          "hex": "1458",
           "value": 5208
         },
         "device": {
+          "hex": "31db",
           "value": 12763
         },
         "sub_device": {
+          "hex": "1000",
           "value": 4096
         },
         "revision": {
+          "hex": "00f3",
           "value": 243
         },
         "model": "Intel PCI bridge",
@@ -437,7 +542,7 @@
         "resources": [
           {
             "type": "irq",
-            "base": 124,
+            "base": 122,
             "triggered": 0,
             "enabled": true
           }
@@ -447,13 +552,17 @@
           "command": 1031,
           "header_type": 1,
           "secondary_bus": 3,
-          "irq": 124,
+          "irq": 122,
           "prog_if": 0
         },
         "driver": "pcieport",
+        "driver_module": "pcieportdrv",
         "drivers": [
           "pcieport"
         ],
+        "driver_modules": [
+          "pcieportdrv"
+        ],
         "module_alias": "pci:v00008086d000031DBsv00001458sd00001000bc06sc04i00"
       }
     ],
@@ -461,6 +570,7 @@
       {
         "architecture": "x86_64",
         "vendor_name": "GenuineIntel",
+        "model_name": "Intel(R) Celeron(R) J4105 CPU @ 1.50GHz",
         "family": 6,
         "model": 122,
         "stepping": 1,
@@ -582,21 +692,24 @@
           "rfds",
           "bhi"
         ],
+        "power_management": [
+          ""
+        ],
         "bogo": 2995.2,
         "cache": 4096,
         "units": 64,
         "physical_id": 0,
         "siblings": 4,
         "cores": 4,
-        "fpu": true,
-        "fpu_exception": true,
+        "fpu": false,
+        "fpu_exception": false,
         "cpuid_level": 24,
         "write_protect": false,
         "clflush_size": 64,
         "cache_alignment": 64,
         "address_sizes": {
-          "physical": 39,
-          "virtual": 48
+          "physical": "0x27",
+          "virtual": "0x30"
         }
       }
     ],
@@ -604,7 +717,13 @@
       {
         "index": 24,
         "attached_to": 14,
+        "class_list": [
+          "disk",
+          "block_device",
+          "nvme"
+        ],
         "bus_type": {
+          "hex": "0096",
           "name": "NVME",
           "value": 150
         },
@@ -613,24 +732,30 @@
           "number": 0
         },
         "base_class": {
+          "hex": "0106",
           "name": "Mass Storage Device",
           "value": 262
         },
         "sub_class": {
+          "hex": "0000",
           "name": "Disk",
           "value": 0
         },
         "vendor": {
+          "hex": "2646",
           "value": 9798
         },
         "sub_vendor": {
+          "hex": "2646",
           "value": 9798
         },
         "device": {
+          "hex": "2263",
           "name": "KINGSTON SA2000M8500G",
           "value": 8803
         },
         "sub_device": {
+          "hex": "2263",
           "value": 8803
         },
         "serial": "50026B7282414E01",
@@ -646,7 +771,6 @@
           "range": 0
         },
         "unix_device_names": [
-          "/dev/disk/by-diskseq/1",
           "/dev/disk/by-id/nvme-KINGSTON_SA2000M8500G_50026B7282414E01",
           "/dev/disk/by-id/nvme-KINGSTON_SA2000M8500G_50026B7282414E01_1",
           "/dev/disk/by-id/nvme-eui.0026b7282414e015",
@@ -659,7 +783,7 @@
             "cylinders": 476940,
             "heads": 64,
             "sectors": 32,
-            "size": 0,
+            "size": "0x0",
             "geo_type": "logical"
           },
           {
@@ -680,586 +804,14 @@
       },
       {
         "index": 25,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 15,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Disk",
-          "value": 0
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "VIRTUAL-DISK",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "serial": "beaf141",
-        "model": "IET VIRTUAL-DISK",
-        "sysfs_id": "/class/block/sdo",
-        "sysfs_bus_id": "15:0:0:1",
-        "sysfs_device_link": "/devices/platform/host15/session111/target15:0:0/15:0:0:1",
-        "unix_device_name": "/dev/sdo",
-        "unix_device_number": {
-          "type": 98,
-          "major": 8,
-          "minor": 224,
-          "range": 16
-        },
-        "unix_device_names": [
-          "/dev/disk/by-diskseq/124",
-          "/dev/disk/by-id/scsi-360000000000000000e000000000e0001",
-          "/dev/disk/by-id/wwn-0x60000000000000000e000000000e0001",
-          "/dev/disk/by-path/ip-10.42.0.177:3260-iscsi-iqn.2019-10.io.longhorn:kitchenowl-lun-1",
-          "/dev/disk/by-uuid/8946a256-09b8-4ca5-b18a-fbde2f0bd674",
-          "/dev/sdo"
-        ],
-        "unix_device_name2": "/dev/sg12",
-        "unix_device_number2": {
-          "type": 99,
-          "major": 21,
-          "minor": 12,
-          "range": 1
-        },
-        "resources": [
-          {
-            "type": "disk_geo",
-            "cylinders": 1024,
-            "heads": 4,
-            "sectors": 50,
-            "size": 0,
-            "geo_type": "logical"
-          },
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 204800,
-            "value_2": 512
-          }
-        ],
-        "driver": "sd",
-        "driver_module": "sd_mod",
-        "drivers": [
-          "sd"
-        ],
-        "driver_modules": [
-          "sd_mod"
-        ]
-      },
-      {
-        "index": 26,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 4,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Disk",
-          "value": 0
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "VIRTUAL-DISK",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "serial": "beaf31",
-        "model": "IET VIRTUAL-DISK",
-        "sysfs_id": "/class/block/sdd",
-        "sysfs_bus_id": "4:0:0:1",
-        "sysfs_device_link": "/devices/platform/host4/session23/target4:0:0/4:0:0:1",
-        "unix_device_name": "/dev/sdd",
-        "unix_device_number": {
-          "type": 98,
-          "major": 8,
-          "minor": 48,
-          "range": 16
-        },
-        "unix_device_names": [
-          "/dev/disk/by-diskseq/36",
-          "/dev/disk/by-id/scsi-360000000000000000e00000000030001",
-          "/dev/disk/by-id/wwn-0x60000000000000000e00000000030001",
-          "/dev/disk/by-path/ip-10.42.0.177:3260-iscsi-iqn.2019-10.io.longhorn:bazarr-lun-1",
-          "/dev/sdd"
-        ],
-        "unix_device_name2": "/dev/sg6",
-        "unix_device_number2": {
-          "type": 99,
-          "major": 21,
-          "minor": 6,
-          "range": 1
-        },
-        "resources": [
-          {
-            "type": "disk_geo",
-            "cylinders": 1024,
-            "heads": 1,
-            "sectors": 52,
-            "size": 0,
-            "geo_type": "logical"
-          },
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 53248,
-            "value_2": 512
-          }
-        ],
-        "driver": "sd",
-        "driver_module": "sd_mod",
-        "drivers": [
-          "sd"
-        ],
-        "driver_modules": [
-          "sd_mod"
-        ]
-      },
-      {
-        "index": 27,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 2,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Disk",
-          "value": 0
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "VIRTUAL-DISK",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "serial": "beaf11",
-        "model": "IET VIRTUAL-DISK",
-        "sysfs_id": "/class/block/sdb",
-        "sysfs_bus_id": "2:0:0:1",
-        "sysfs_device_link": "/devices/platform/host2/session1/target2:0:0/2:0:0:1",
-        "unix_device_name": "/dev/sdb",
-        "unix_device_number": {
-          "type": 98,
-          "major": 8,
-          "minor": 16,
-          "range": 16
-        },
-        "unix_device_names": [
-          "/dev/disk/by-diskseq/14",
-          "/dev/disk/by-id/scsi-360000000000000000e00000000010001",
-          "/dev/disk/by-id/wwn-0x60000000000000000e00000000010001",
-          "/dev/disk/by-path/ip-10.42.0.177:3260-iscsi-iqn.2019-10.io.longhorn:pvc-9701d2f8-4cf0-490b-a0ad-2c1151bbf15f-lun-1",
-          "/dev/sdb"
-        ],
-        "unix_device_name2": "/dev/sg2",
-        "unix_device_number2": {
-          "type": 99,
-          "major": 21,
-          "minor": 2,
-          "range": 1
-        },
-        "resources": [
-          {
-            "type": "disk_geo",
-            "cylinders": 1018,
-            "heads": 166,
-            "sectors": 62,
-            "size": 0,
-            "geo_type": "logical"
-          },
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 10485760,
-            "value_2": 512
-          }
-        ],
-        "driver": "sd",
-        "driver_module": "sd_mod",
-        "drivers": [
-          "sd"
-        ],
-        "driver_modules": [
-          "sd_mod"
-        ]
-      },
-      {
-        "index": 28,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 11,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Disk",
-          "value": 0
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "VIRTUAL-DISK",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "serial": "beaf101",
-        "model": "IET VIRTUAL-DISK",
-        "sysfs_id": "/class/block/sdk",
-        "sysfs_bus_id": "11:0:0:1",
-        "sysfs_device_link": "/devices/platform/host11/session83/target11:0:0/11:0:0:1",
-        "unix_device_name": "/dev/sdk",
-        "unix_device_number": {
-          "type": 98,
-          "major": 8,
-          "minor": 160,
-          "range": 16
-        },
-        "unix_device_names": [
-          "/dev/disk/by-diskseq/96",
-          "/dev/disk/by-id/scsi-360000000000000000e000000000a0001",
-          "/dev/disk/by-id/wwn-0x60000000000000000e000000000a0001",
-          "/dev/disk/by-path/ip-10.42.0.177:3260-iscsi-iqn.2019-10.io.longhorn:pihole-dnsmasq-lun-1",
-          "/dev/disk/by-uuid/636d77cf-0418-43fb-b86c-22cde408cf08",
-          "/dev/sdk"
-        ],
-        "unix_device_name2": "/dev/sg10",
-        "unix_device_number2": {
-          "type": 99,
-          "major": 21,
-          "minor": 10,
-          "range": 1
-        },
-        "resources": [
-          {
-            "type": "disk_geo",
-            "cylinders": 1024,
-            "heads": 1,
-            "sectors": 32,
-            "size": 0,
-            "geo_type": "logical"
-          },
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 32768,
-            "value_2": 512
-          }
-        ],
-        "driver": "sd",
-        "driver_module": "sd_mod",
-        "drivers": [
-          "sd"
-        ],
-        "driver_modules": [
-          "sd_mod"
-        ]
-      },
-      {
-        "index": 29,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 17,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Disk",
-          "value": 0
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "VIRTUAL-DISK",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "serial": "beaf161",
-        "model": "IET VIRTUAL-DISK",
-        "sysfs_id": "/class/block/sdq",
-        "sysfs_bus_id": "17:0:0:1",
-        "sysfs_device_link": "/devices/platform/host17/session113/target17:0:0/17:0:0:1",
-        "unix_device_name": "/dev/sdq",
-        "unix_device_number": {
-          "type": 98,
-          "major": 65,
-          "minor": 0,
-          "range": 16
-        },
-        "unix_device_names": [
-          "/dev/disk/by-diskseq/126",
-          "/dev/disk/by-id/scsi-360000000000000000e00000000100001",
-          "/dev/disk/by-id/wwn-0x60000000000000000e00000000100001",
-          "/dev/disk/by-path/ip-10.42.0.177:3260-iscsi-iqn.2019-10.io.longhorn:nextcloud-db-lun-1",
-          "/dev/disk/by-uuid/751984ab-5b1a-4109-9c75-2babdccede30",
-          "/dev/sdq"
-        ],
-        "unix_device_name2": "/dev/sg14",
-        "unix_device_number2": {
-          "type": 99,
-          "major": 21,
-          "minor": 14,
-          "range": 1
-        },
-        "resources": [
-          {
-            "type": "disk_geo",
-            "cylinders": 1016,
-            "heads": 13,
-            "sectors": 62,
-            "size": 0,
-            "geo_type": "logical"
-          },
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 819200,
-            "value_2": 512
-          }
-        ],
-        "driver": "sd",
-        "driver_module": "sd_mod",
-        "drivers": [
-          "sd"
-        ],
-        "driver_modules": [
-          "sd_mod"
-        ]
-      },
-      {
-        "index": 30,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 3,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Disk",
-          "value": 0
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "VIRTUAL-DISK",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "serial": "beaf21",
-        "model": "IET VIRTUAL-DISK",
-        "sysfs_id": "/class/block/sdc",
-        "sysfs_bus_id": "3:0:0:1",
-        "sysfs_device_link": "/devices/platform/host3/session15/target3:0:0/3:0:0:1",
-        "unix_device_name": "/dev/sdc",
-        "unix_device_number": {
-          "type": 98,
-          "major": 8,
-          "minor": 32,
-          "range": 16
-        },
-        "unix_device_names": [
-          "/dev/disk/by-diskseq/28",
-          "/dev/disk/by-id/scsi-360000000000000000e00000000020001",
-          "/dev/disk/by-id/wwn-0x60000000000000000e00000000020001",
-          "/dev/disk/by-path/ip-10.42.0.177:3260-iscsi-iqn.2019-10.io.longhorn:radicale-lun-1",
-          "/dev/sdc"
-        ],
-        "unix_device_name2": "/dev/sg4",
-        "unix_device_number2": {
-          "type": 99,
-          "major": 21,
-          "minor": 4,
-          "range": 1
-        },
-        "resources": [
-          {
-            "type": "disk_geo",
-            "cylinders": 1008,
-            "heads": 7,
-            "sectors": 58,
-            "size": 0,
-            "geo_type": "logical"
-          },
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 409600,
-            "value_2": 512
-          }
-        ],
-        "driver": "sd",
-        "driver_module": "sd_mod",
-        "drivers": [
-          "sd"
-        ],
-        "driver_modules": [
-          "sd_mod"
-        ]
-      },
-      {
-        "index": 31,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 20,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Disk",
-          "value": 0
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "VIRTUAL-DISK",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "serial": "beaf191",
-        "model": "IET VIRTUAL-DISK",
-        "sysfs_id": "/class/block/sdt",
-        "sysfs_bus_id": "20:0:0:1",
-        "sysfs_device_link": "/devices/platform/host20/session116/target20:0:0/20:0:0:1",
-        "unix_device_name": "/dev/sdt",
-        "unix_device_number": {
-          "type": 98,
-          "major": 65,
-          "minor": 48,
-          "range": 16
-        },
-        "unix_device_names": [
-          "/dev/disk/by-diskseq/129",
-          "/dev/disk/by-id/scsi-360000000000000000e00000000130001",
-          "/dev/disk/by-id/wwn-0x60000000000000000e00000000130001",
-          "/dev/disk/by-path/ip-10.42.0.177:3260-iscsi-iqn.2019-10.io.longhorn:hedgedoc-db-lun-1",
-          "/dev/disk/by-uuid/758d3a46-6501-432f-b839-8dfb3767bf03",
-          "/dev/sdt"
-        ],
-        "unix_device_name2": "/dev/sg16",
-        "unix_device_number2": {
-          "type": 99,
-          "major": 21,
-          "minor": 16,
-          "range": 1
-        },
-        "resources": [
-          {
-            "type": "disk_geo",
-            "cylinders": 1024,
-            "heads": 4,
-            "sectors": 50,
-            "size": 0,
-            "geo_type": "logical"
-          },
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 204800,
-            "value_2": 512
-          }
-        ],
-        "driver": "sd",
-        "driver_module": "sd_mod",
-        "drivers": [
-          "sd"
-        ],
-        "driver_modules": [
-          "sd_mod"
-        ]
-      },
-      {
-        "index": 32,
         "attached_to": 18,
+        "class_list": [
+          "disk",
+          "ide",
+          "block_device"
+        ],
         "bus_type": {
+          "hex": "0085",
           "name": "IDE",
           "value": 133
         },
@@ -1268,22 +820,27 @@
           "number": 0
         },
         "base_class": {
+          "hex": "0106",
           "name": "Mass Storage Device",
           "value": 262
         },
         "sub_class": {
+          "hex": "0000",
           "name": "Disk",
           "value": 0
         },
         "vendor": {
+          "hex": "0000",
           "name": "Samsung",
           "value": 0
         },
         "device": {
+          "hex": "0000",
           "name": "SSD 860",
           "value": 0
         },
         "revision": {
+          "hex": "0000",
           "name": "4B6Q",
           "value": 0
         },
@@ -1300,7 +857,6 @@
           "range": 16
         },
         "unix_device_names": [
-          "/dev/disk/by-diskseq/2",
           "/dev/disk/by-id/ata-Samsung_SSD_860_EVO_250GB_S3YJNB0K486420W",
           "/dev/disk/by-id/wwn-0x5002538e40364c21",
           "/dev/disk/by-path/pci-0000:00:12.0-ata-1",
@@ -1313,7 +869,7 @@
             "cylinders": 30401,
             "heads": 255,
             "sectors": 63,
-            "size": 0,
+            "size": "0x0",
             "geo_type": "logical"
           },
           {
@@ -1333,96 +889,18 @@
           "ahci",
           "sd_mod"
         ]
-      },
-      {
-        "index": 33,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 8,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Disk",
-          "value": 0
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "VIRTUAL-DISK",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "serial": "beaf71",
-        "model": "IET VIRTUAL-DISK",
-        "sysfs_id": "/class/block/sdh",
-        "sysfs_bus_id": "8:0:0:1",
-        "sysfs_device_link": "/devices/platform/host8/session82/target8:0:0/8:0:0:1",
-        "unix_device_name": "/dev/sdh",
-        "unix_device_number": {
-          "type": 98,
-          "major": 8,
-          "minor": 112,
-          "range": 16
-        },
-        "unix_device_names": [
-          "/dev/disk/by-diskseq/95",
-          "/dev/disk/by-id/scsi-360000000000000000e00000000070001",
-          "/dev/disk/by-id/wwn-0x60000000000000000e00000000070001",
-          "/dev/disk/by-path/ip-10.42.0.177:3260-iscsi-iqn.2019-10.io.longhorn:pihole-data-lun-1",
-          "/dev/disk/by-uuid/c323da21-9775-4c9d-8825-89b981680747",
-          "/dev/sdh"
-        ],
-        "unix_device_name2": "/dev/sg8",
-        "unix_device_number2": {
-          "type": 99,
-          "major": 21,
-          "minor": 8,
-          "range": 1
-        },
-        "resources": [
-          {
-            "type": "disk_geo",
-            "cylinders": 1024,
-            "heads": 25,
-            "sectors": 60,
-            "size": 0,
-            "geo_type": "logical"
-          },
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 1536000,
-            "value_2": 512
-          }
-        ],
-        "driver": "sd",
-        "driver_module": "sd_mod",
-        "drivers": [
-          "sd"
-        ],
-        "driver_modules": [
-          "sd_mod"
-        ]
       }
     ],
     "graphics_card": [
       {
         "index": 23,
         "attached_to": 0,
+        "class_list": [
+          "graphics_card",
+          "pci"
+        ],
         "bus_type": {
+          "hex": "0004",
           "name": "PCI",
           "value": 4
         },
@@ -1431,31 +909,39 @@
           "number": 2
         },
         "base_class": {
+          "hex": "0003",
           "name": "Display controller",
           "value": 3
         },
         "sub_class": {
+          "hex": "0000",
           "name": "VGA compatible controller",
           "value": 0
         },
         "pci_interface": {
+          "hex": "0000",
           "name": "VGA",
           "value": 0
         },
         "vendor": {
+          "hex": "8086",
           "name": "Intel Corporation",
           "value": 32902
         },
         "sub_vendor": {
+          "hex": "1458",
           "value": 5208
         },
         "device": {
+          "hex": "3185",
           "value": 12677
         },
         "sub_device": {
+          "hex": "1000",
           "value": 4096
         },
         "revision": {
+          "hex": "0003",
           "value": 3
         },
         "model": "Intel VGA compatible controller",
@@ -1471,7 +957,7 @@
           },
           {
             "type": "irq",
-            "base": 134,
+            "base": 136,
             "triggered": 0,
             "enabled": true
           },
@@ -1505,7 +991,7 @@
           "command": 1031,
           "header_type": 0,
           "secondary_bus": 0,
-          "irq": 134,
+          "irq": 136,
           "prog_if": 0
         },
         "driver": "i915",
@@ -1522,9 +1008,14 @@
     ],
     "hub": [
       {
-        "index": 43,
+        "index": 27,
         "attached_to": 21,
+        "class_list": [
+          "usb",
+          "hub"
+        ],
         "bus_type": {
+          "hex": "0086",
           "name": "USB",
           "value": 134
         },
@@ -1533,23 +1024,27 @@
           "number": 0
         },
         "base_class": {
+          "hex": "010a",
           "name": "Hub",
           "value": 266
         },
         "vendor": {
-          "name": "Linux 6.6.32 xhci-hcd",
+          "hex": "1d6b",
+          "name": "Linux 6.14.8 xhci-hcd",
           "value": 7531
         },
         "device": {
+          "hex": "0002",
           "name": "xHCI Host Controller",
           "value": 2
         },
         "revision": {
-          "name": "6.06",
+          "hex": "0000",
+          "name": "6.14",
           "value": 0
         },
         "serial": "0000:00:15.0",
-        "model": "Linux 6.6.32 xhci-hcd xHCI Host Controller",
+        "model": "Linux 6.14.8 xhci-hcd xHCI Host Controller",
         "sysfs_id": "/devices/pci0000:00/0000:00:15.0/usb1/1-0:1.0",
         "sysfs_bus_id": "1-0:1.0",
         "resources": [
@@ -1564,19 +1059,23 @@
         ],
         "detail": {
           "device_class": {
+            "hex": "0009",
             "name": "hub",
             "value": 9
           },
           "device_subclass": {
+            "hex": "0000",
             "name": "per_interface",
             "value": 0
           },
           "device_protocol": 1,
           "interface_class": {
+            "hex": "0009",
             "name": "hub",
             "value": 9
           },
           "interface_subclass": {
+            "hex": "0000",
             "name": "per_interface",
             "value": 0
           },
@@ -1586,15 +1085,24 @@
         },
         "hotplug": "usb",
         "driver": "hub",
+        "driver_module": "usbcore",
         "drivers": [
           "hub"
         ],
-        "module_alias": "usb:v1D6Bp0002d0606dc09dsc00dp01ic09isc00ip00in00"
+        "driver_modules": [
+          "usbcore"
+        ],
+        "module_alias": "usb:v1D6Bp0002d0614dc09dsc00dp01ic09isc00ip00in00"
       },
       {
-        "index": 45,
+        "index": 29,
         "attached_to": 21,
+        "class_list": [
+          "usb",
+          "hub"
+        ],
         "bus_type": {
+          "hex": "0086",
           "name": "USB",
           "value": 134
         },
@@ -1603,40 +1111,48 @@
           "number": 0
         },
         "base_class": {
+          "hex": "010a",
           "name": "Hub",
           "value": 266
         },
         "vendor": {
-          "name": "Linux 6.6.32 xhci-hcd",
+          "hex": "1d6b",
+          "name": "Linux 6.14.8 xhci-hcd",
           "value": 7531
         },
         "device": {
+          "hex": "0003",
           "name": "xHCI Host Controller",
           "value": 3
         },
         "revision": {
-          "name": "6.06",
+          "hex": "0000",
+          "name": "6.14",
           "value": 0
         },
         "serial": "0000:00:15.0",
-        "model": "Linux 6.6.32 xhci-hcd xHCI Host Controller",
+        "model": "Linux 6.14.8 xhci-hcd xHCI Host Controller",
         "sysfs_id": "/devices/pci0000:00/0000:00:15.0/usb2/2-0:1.0",
         "sysfs_bus_id": "2-0:1.0",
         "detail": {
           "device_class": {
+            "hex": "0009",
             "name": "hub",
             "value": 9
           },
           "device_subclass": {
+            "hex": "0000",
             "name": "per_interface",
             "value": 0
           },
           "device_protocol": 3,
           "interface_class": {
+            "hex": "0009",
             "name": "hub",
             "value": 9
           },
           "interface_subclass": {
+            "hex": "0000",
             "name": "per_interface",
             "value": 0
           },
@@ -1646,21 +1162,30 @@
         },
         "hotplug": "usb",
         "driver": "hub",
+        "driver_module": "usbcore",
         "drivers": [
           "hub"
         ],
-        "module_alias": "usb:v1D6Bp0003d0606dc09dsc00dp03ic09isc00ip00in00"
+        "driver_modules": [
+          "usbcore"
+        ],
+        "module_alias": "usb:v1D6Bp0003d0614dc09dsc00dp03ic09isc00ip00in00"
       }
     ],
     "memory": [
       {
         "index": 7,
         "attached_to": 0,
+        "class_list": [
+          "memory"
+        ],
         "base_class": {
+          "hex": "0101",
           "name": "Internally Used Class",
           "value": 257
         },
         "sub_class": {
+          "hex": "0002",
           "name": "Main Memory",
           "value": 2
         },
@@ -1669,7 +1194,7 @@
           {
             "type": "mem",
             "base": 0,
-            "range": 16577695744,
+            "range": 16572944384,
             "enabled": true,
             "access": "read_write",
             "prefetch": "unknown"
@@ -1685,7 +1210,12 @@
       {
         "index": 8,
         "attached_to": 20,
+        "class_list": [
+          "network_controller",
+          "pci"
+        ],
         "bus_type": {
+          "hex": "0004",
           "name": "PCI",
           "value": 4
         },
@@ -1694,26 +1224,33 @@
           "number": 0
         },
         "base_class": {
+          "hex": "0002",
           "name": "Network controller",
           "value": 2
         },
         "sub_class": {
+          "hex": "0000",
           "name": "Ethernet controller",
           "value": 0
         },
         "vendor": {
+          "hex": "10ec",
           "value": 4332
         },
         "sub_vendor": {
+          "hex": "1458",
           "value": 5208
         },
         "device": {
+          "hex": "8168",
           "value": 33128
         },
         "sub_device": {
+          "hex": "e000",
           "value": 57344
         },
         "revision": {
+          "hex": "0015",
           "value": 21
         },
         "model": "Ethernet controller",
@@ -1783,7 +1320,13 @@
       {
         "index": 12,
         "attached_to": 11,
+        "class_list": [
+          "network_controller",
+          "pci",
+          "wlan_card"
+        ],
         "bus_type": {
+          "hex": "0004",
           "name": "PCI",
           "value": 4
         },
@@ -1792,37 +1335,52 @@
           "number": 0
         },
         "base_class": {
+          "hex": "0002",
           "name": "Network controller",
           "value": 2
         },
         "sub_class": {
-          "name": "Network controller",
-          "value": 128
+          "hex": "0082",
+          "name": "WLAN controller",
+          "value": 130
         },
         "vendor": {
+          "hex": "8086",
           "name": "Intel Corporation",
           "value": 32902
         },
         "sub_vendor": {
+          "hex": "8086",
           "name": "Intel Corporation",
           "value": 32902
         },
         "device": {
+          "hex": "24fb",
           "value": 9467
         },
         "sub_device": {
+          "hex": "2110",
           "value": 8464
         },
         "revision": {
+          "hex": "0010",
           "value": 16
         },
-        "model": "Intel Network controller",
+        "model": "Intel WLAN controller",
         "sysfs_id": "/devices/pci0000:00/0000:00:13.2/0000:02:00.0",
         "sysfs_bus_id": "0000:02:00.0",
+        "unix_device_name": "wlo1",
+        "unix_device_names": [
+          "wlo1"
+        ],
         "resources": [
+          {
+            "type": "hwaddr",
+            "address": 53
+          },
           {
             "type": "irq",
-            "base": 20,
+            "base": 135,
             "triggered": 0,
             "enabled": true
           },
@@ -1833,29 +1391,152 @@
             "enabled": true,
             "access": "read_write",
             "prefetch": "no"
+          },
+          {
+            "type": "phwaddr",
+            "address": 53
+          },
+          {
+            "type": "wlan",
+            "channels": [
+              "1",
+              "2",
+              "3",
+              "4",
+              "5",
+              "6",
+              "7",
+              "8",
+              "9",
+              "10",
+              "11",
+              "12",
+              "13",
+              "14",
+              "36",
+              "40",
+              "44",
+              "48",
+              "52",
+              "56",
+              "60",
+              "64",
+              "100",
+              "104",
+              "108",
+              "112",
+              "116",
+              "120",
+              "124",
+              "128",
+              "132",
+              "136"
+            ],
+            "frequencies": [
+              "2.412",
+              "2.417",
+              "2.422",
+              "2.427",
+              "2.432",
+              "2.437",
+              "2.442",
+              "2.447",
+              "2.452",
+              "2.457",
+              "2.462",
+              "2.467",
+              "2.472",
+              "2.484",
+              "5.18",
+              "5.2",
+              "5.22",
+              "5.24",
+              "5.26",
+              "5.28",
+              "5.3",
+              "5.32",
+              "5.5",
+              "5.52",
+              "5.54",
+              "5.56",
+              "5.58",
+              "5.6",
+              "5.62",
+              "5.64",
+              "5.66",
+              "5.68"
+            ],
+            "auth_modes": [
+              "open",
+              "sharedkey",
+              "wpa-psk",
+              "wpa-eap"
+            ],
+            "enc_modes": [
+              "WEP40",
+              "WEP104",
+              "TKIP",
+              "CCMP"
+            ]
           }
         ],
         "detail": {
           "function": 0,
-          "command": 2,
+          "command": 1030,
           "header_type": 0,
           "secondary_bus": 0,
-          "irq": 20,
+          "irq": 135,
           "prog_if": 0
         },
+        "driver": "iwlwifi",
+        "driver_module": "iwlwifi",
+        "drivers": [
+          "iwlwifi"
+        ],
+        "driver_modules": [
+          "iwlwifi"
+        ],
         "module_alias": "pci:v00008086d000024FBsv00008086sd00002110bc02sc80i00",
         "label": "Onboard - RTK Ethernet"
       }
     ],
     "network_interface": [
       {
-        "index": 52,
-        "attached_to": 8,
+        "index": 35,
+        "attached_to": 0,
+        "class_list": [
+          "network_interface"
+        ],
         "base_class": {
+          "hex": "0107",
           "name": "Network Interface",
           "value": 263
         },
         "sub_class": {
+          "hex": "0000",
+          "name": "Loopback",
+          "value": 0
+        },
+        "model": "Loopback network interface",
+        "sysfs_id": "/class/net/lo",
+        "unix_device_name": "lo",
+        "unix_device_names": [
+          "lo"
+        ]
+      },
+      {
+        "index": 41,
+        "attached_to": 8,
+        "class_list": [
+          "network_interface"
+        ],
+        "base_class": {
+          "hex": "0107",
+          "name": "Network Interface",
+          "value": 263
+        },
+        "sub_class": {
+          "hex": "0001",
           "name": "Ethernet",
           "value": 1
         },
@@ -1886,219 +1567,58 @@
         ]
       },
       {
-        "index": 75,
-        "attached_to": 0,
+        "index": 43,
+        "attached_to": 12,
+        "class_list": [
+          "network_interface"
+        ],
         "base_class": {
+          "hex": "0107",
           "name": "Network Interface",
           "value": 263
         },
         "sub_class": {
-          "name": "Loopback",
-          "value": 0
+          "hex": "0001",
+          "name": "Ethernet",
+          "value": 1
         },
-        "model": "Loopback network interface",
-        "sysfs_id": "/class/net/lo",
-        "unix_device_name": "lo",
+        "model": "Ethernet network interface",
+        "sysfs_id": "/class/net/wlo1",
+        "sysfs_device_link": "/devices/pci0000:00/0000:00:13.2/0000:02:00.0",
+        "unix_device_name": "wlo1",
         "unix_device_names": [
-          "lo"
+          "wlo1"
+        ],
+        "resources": [
+          {
+            "type": "hwaddr",
+            "address": 53
+          },
+          {
+            "type": "phwaddr",
+            "address": 53
+          }
+        ],
+        "driver": "iwlwifi",
+        "driver_module": "iwlwifi",
+        "drivers": [
+          "iwlwifi"
+        ],
+        "driver_modules": [
+          "iwlwifi"
         ]
       }
     ],
-    "storage_controller": [
-      {
-        "index": 14,
-        "attached_to": 13,
-        "bus_type": {
-          "name": "PCI",
-          "value": 4
-        },
-        "slot": {
-          "bus": 1,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass storage controller",
-          "value": 1
-        },
-        "sub_class": {
-          "value": 8
-        },
-        "pci_interface": {
-          "value": 2
-        },
-        "vendor": {
-          "value": 9798
-        },
-        "sub_vendor": {
-          "value": 9798
-        },
-        "device": {
-          "value": 8803
-        },
-        "sub_device": {
-          "value": 8803
-        },
-        "revision": {
-          "value": 3
-        },
-        "model": "Mass storage controller",
-        "sysfs_id": "/devices/pci0000:00/0000:00:13.0/0000:01:00.0",
-        "sysfs_bus_id": "0000:01:00.0",
-        "resources": [
-          {
-            "type": "irq",
-            "base": 22,
-            "triggered": 0,
-            "enabled": true
-          },
-          {
-            "type": "mem",
-            "base": 2703228928,
-            "range": 16384,
-            "enabled": true,
-            "access": "read_write",
-            "prefetch": "no"
-          }
-        ],
-        "detail": {
-          "function": 0,
-          "command": 1030,
-          "header_type": 0,
-          "secondary_bus": 0,
-          "irq": 22,
-          "prog_if": 2
-        },
-        "driver": "nvme",
-        "driver_module": "nvme",
-        "drivers": [
-          "nvme"
-        ],
-        "driver_modules": [
-          "nvme"
-        ],
-        "module_alias": "pci:v00002646d00002263sv00002646sd00002263bc01sc08i02"
-      },
-      {
-        "index": 18,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "PCI",
-          "value": 4
-        },
-        "slot": {
-          "bus": 0,
-          "number": 18
-        },
-        "base_class": {
-          "name": "Mass storage controller",
-          "value": 1
-        },
-        "sub_class": {
-          "value": 6
-        },
-        "pci_interface": {
-          "value": 1
-        },
-        "vendor": {
-          "name": "Intel Corporation",
-          "value": 32902
-        },
-        "sub_vendor": {
-          "value": 5208
-        },
-        "device": {
-          "value": 12771
-        },
-        "sub_device": {
-          "value": 4096
-        },
-        "revision": {
-          "value": 3
-        },
-        "model": "Intel Mass storage controller",
-        "sysfs_id": "/devices/pci0000:00/0000:00:12.0",
-        "sysfs_bus_id": "0000:00:12.0",
-        "resources": [
-          {
-            "type": "io",
-            "base": 61536,
-            "range": 32,
-            "enabled": true,
-            "access": "read_write"
-          },
-          {
-            "type": "io",
-            "base": 61568,
-            "range": 4,
-            "enabled": true,
-            "access": "read_write"
-          },
-          {
-            "type": "io",
-            "base": 61584,
-            "range": 8,
-            "enabled": true,
-            "access": "read_write"
-          },
-          {
-            "type": "irq",
-            "base": 131,
-            "triggered": 0,
-            "enabled": true
-          },
-          {
-            "type": "mem",
-            "base": 2704343040,
-            "range": 8192,
-            "enabled": true,
-            "access": "read_write",
-            "prefetch": "no"
-          },
-          {
-            "type": "mem",
-            "base": 2704371712,
-            "range": 2048,
-            "enabled": true,
-            "access": "read_write",
-            "prefetch": "no"
-          },
-          {
-            "type": "mem",
-            "base": 2704375808,
-            "range": 256,
-            "enabled": true,
-            "access": "read_write",
-            "prefetch": "no"
-          }
-        ],
-        "detail": {
-          "function": 0,
-          "command": 1031,
-          "header_type": 0,
-          "secondary_bus": 0,
-          "irq": 131,
-          "prog_if": 1
-        },
-        "driver": "ahci",
-        "driver_module": "ahci",
-        "drivers": [
-          "ahci"
-        ],
-        "driver_modules": [
-          "ahci"
-        ],
-        "module_alias": "pci:v00008086d000031E3sv00001458sd00001000bc01sc06i01",
-        "label": "Onboard - SATA"
-      }
-    ],
-    "system": {
-      "form_factor": "desktop"
-    },
-    "unknown": [
+    "pci": [
       {
         "index": 9,
         "attached_to": 0,
+        "class_list": [
+          "pci",
+          "unknown"
+        ],
         "bus_type": {
+          "hex": "0004",
           "name": "PCI",
           "value": 4
         },
@@ -2107,29 +1627,37 @@
           "number": 28
         },
         "base_class": {
+          "hex": "0008",
           "name": "Generic system peripheral",
           "value": 8
         },
         "sub_class": {
+          "hex": "0005",
           "value": 5
         },
         "pci_interface": {
+          "hex": "0001",
           "value": 1
         },
         "vendor": {
+          "hex": "8086",
           "name": "Intel Corporation",
           "value": 32902
         },
         "sub_vendor": {
+          "hex": "1458",
           "value": 5208
         },
         "device": {
+          "hex": "31cc",
           "value": 12748
         },
         "sub_device": {
+          "hex": "1000",
           "value": 4096
         },
         "revision": {
+          "hex": "0003",
           "value": 3
         },
         "model": "Intel Generic system peripheral",
@@ -2181,7 +1709,12 @@
       {
         "index": 15,
         "attached_to": 0,
+        "class_list": [
+          "pci",
+          "unknown"
+        ],
         "bus_type": {
+          "hex": "0004",
           "name": "PCI",
           "value": 4
         },
@@ -2190,29 +1723,37 @@
           "number": 30
         },
         "base_class": {
+          "hex": "0008",
           "name": "Generic system peripheral",
           "value": 8
         },
         "sub_class": {
+          "hex": "0005",
           "value": 5
         },
         "pci_interface": {
+          "hex": "0001",
           "value": 1
         },
         "vendor": {
+          "hex": "8086",
           "name": "Intel Corporation",
           "value": 32902
         },
         "sub_vendor": {
+          "hex": "1458",
           "value": 5208
         },
         "device": {
+          "hex": "31d0",
           "value": 12752
         },
         "sub_device": {
+          "hex": "1000",
           "value": 4096
         },
         "revision": {
+          "hex": "0003",
           "value": 3
         },
         "model": "Intel Generic system peripheral",
@@ -2264,7 +1805,12 @@
       {
         "index": 16,
         "attached_to": 0,
+        "class_list": [
+          "pci",
+          "unknown"
+        ],
         "bus_type": {
+          "hex": "0004",
           "name": "PCI",
           "value": 4
         },
@@ -2273,27 +1819,34 @@
           "number": 15
         },
         "base_class": {
+          "hex": "0007",
           "name": "Communication controller",
           "value": 7
         },
         "sub_class": {
+          "hex": "0080",
           "name": "Communication controller",
           "value": 128
         },
         "vendor": {
+          "hex": "8086",
           "name": "Intel Corporation",
           "value": 32902
         },
         "sub_vendor": {
+          "hex": "1458",
           "value": 5208
         },
         "device": {
+          "hex": "319a",
           "value": 12698
         },
         "sub_device": {
+          "hex": "1000",
           "value": 4096
         },
         "revision": {
+          "hex": "0003",
           "value": 3
         },
         "model": "Intel Communication controller",
@@ -2302,7 +1855,7 @@
         "resources": [
           {
             "type": "irq",
-            "base": 132,
+            "base": 134,
             "triggered": 0,
             "enabled": true
           },
@@ -2320,7 +1873,7 @@
           "command": 1030,
           "header_type": 0,
           "secondary_bus": 0,
-          "irq": 132,
+          "irq": 134,
           "prog_if": 0
         },
         "driver": "mei_me",
@@ -2337,7 +1890,12 @@
       {
         "index": 19,
         "attached_to": 0,
+        "class_list": [
+          "pci",
+          "unknown"
+        ],
         "bus_type": {
+          "hex": "0004",
           "name": "PCI",
           "value": 4
         },
@@ -2346,27 +1904,34 @@
           "number": 31
         },
         "base_class": {
+          "hex": "000c",
           "name": "Serial bus controller",
           "value": 12
         },
         "sub_class": {
+          "hex": "0005",
           "name": "SMBus",
           "value": 5
         },
         "vendor": {
+          "hex": "8086",
           "name": "Intel Corporation",
           "value": 32902
         },
         "sub_vendor": {
+          "hex": "1458",
           "value": 5208
         },
         "device": {
+          "hex": "31d4",
           "value": 12756
         },
         "sub_device": {
+          "hex": "1000",
           "value": 4096
         },
         "revision": {
+          "hex": "0003",
           "value": 3
         },
         "model": "Intel SMBus",
@@ -2417,7 +1982,12 @@
       {
         "index": 22,
         "attached_to": 0,
+        "class_list": [
+          "pci",
+          "unknown"
+        ],
         "bus_type": {
+          "hex": "0004",
           "name": "PCI",
           "value": 4
         },
@@ -2426,27 +1996,34 @@
           "number": 0
         },
         "base_class": {
+          "hex": "0008",
           "name": "Generic system peripheral",
           "value": 8
         },
         "sub_class": {
+          "hex": "0080",
           "name": "System peripheral",
           "value": 128
         },
         "vendor": {
+          "hex": "8086",
           "name": "Intel Corporation",
           "value": 32902
         },
         "sub_vendor": {
+          "hex": "1458",
           "value": 5208
         },
         "device": {
+          "hex": "3190",
           "value": 12688
         },
         "sub_device": {
+          "hex": "1000",
           "value": 4096
         },
         "revision": {
+          "hex": "0003",
           "value": 3
         },
         "model": "Intel System peripheral",
@@ -2478,373 +2055,234 @@
         },
         "module_alias": "pci:v00008086d00003190sv00001458sd00001000bc08sc80i00",
         "label": "Onboard - Other"
-      },
-      {
-        "index": 34,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 11,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Storage Device",
-          "value": 128
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "Controller",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "model": "IET Controller",
-        "sysfs_id": "/class/scsi_generic/sg9",
-        "sysfs_bus_id": "11:0:0:0",
-        "unix_device_name": "/dev/sg9",
-        "unix_device_number": {
-          "type": 99,
-          "major": 21,
-          "minor": 9,
-          "range": 1
-        },
-        "unix_device_names": [
-          "/dev/sg9"
-        ]
-      },
-      {
-        "index": 35,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 8,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Storage Device",
-          "value": 128
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "Controller",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "model": "IET Controller",
-        "sysfs_id": "/class/scsi_generic/sg7",
-        "sysfs_bus_id": "8:0:0:0",
-        "unix_device_name": "/dev/sg7",
-        "unix_device_number": {
-          "type": 99,
-          "major": 21,
-          "minor": 7,
-          "range": 1
-        },
-        "unix_device_names": [
-          "/dev/sg7"
-        ]
-      },
-      {
-        "index": 36,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 4,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Storage Device",
-          "value": 128
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "Controller",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "model": "IET Controller",
-        "sysfs_id": "/class/scsi_generic/sg5",
-        "sysfs_bus_id": "4:0:0:0",
-        "unix_device_name": "/dev/sg5",
-        "unix_device_number": {
-          "type": 99,
-          "major": 21,
-          "minor": 5,
-          "range": 1
-        },
-        "unix_device_names": [
-          "/dev/sg5"
-        ]
-      },
-      {
-        "index": 37,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 20,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Storage Device",
-          "value": 128
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "Controller",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "model": "IET Controller",
-        "sysfs_id": "/class/scsi_generic/sg15",
-        "sysfs_bus_id": "20:0:0:0",
-        "unix_device_name": "/dev/sg15",
-        "unix_device_number": {
-          "type": 99,
-          "major": 21,
-          "minor": 15,
-          "range": 1
-        },
-        "unix_device_names": [
-          "/dev/sg15"
-        ]
-      },
-      {
-        "index": 38,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 3,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Storage Device",
-          "value": 128
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "Controller",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "model": "IET Controller",
-        "sysfs_id": "/class/scsi_generic/sg3",
-        "sysfs_bus_id": "3:0:0:0",
-        "unix_device_name": "/dev/sg3",
-        "unix_device_number": {
-          "type": 99,
-          "major": 21,
-          "minor": 3,
-          "range": 1
-        },
-        "unix_device_names": [
-          "/dev/sg3"
-        ]
-      },
-      {
-        "index": 39,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 17,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Storage Device",
-          "value": 128
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "Controller",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "model": "IET Controller",
-        "sysfs_id": "/class/scsi_generic/sg13",
-        "sysfs_bus_id": "17:0:0:0",
-        "unix_device_name": "/dev/sg13",
-        "unix_device_number": {
-          "type": 99,
-          "major": 21,
-          "minor": 13,
-          "range": 1
-        },
-        "unix_device_names": [
-          "/dev/sg13"
-        ]
-      },
-      {
-        "index": 40,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 2,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Storage Device",
-          "value": 128
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "Controller",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "model": "IET Controller",
-        "sysfs_id": "/class/scsi_generic/sg1",
-        "sysfs_bus_id": "2:0:0:0",
-        "unix_device_name": "/dev/sg1",
-        "unix_device_number": {
-          "type": 99,
-          "major": 21,
-          "minor": 1,
-          "range": 1
-        },
-        "unix_device_names": [
-          "/dev/sg1"
-        ]
-      },
-      {
-        "index": 41,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 15,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Storage Device",
-          "value": 128
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "Controller",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "model": "IET Controller",
-        "sysfs_id": "/class/scsi_generic/sg11",
-        "sysfs_bus_id": "15:0:0:0",
-        "unix_device_name": "/dev/sg11",
-        "unix_device_number": {
-          "type": 99,
-          "major": 21,
-          "minor": 11,
-          "range": 1
-        },
-        "unix_device_names": [
-          "/dev/sg11"
-        ]
       }
     ],
+    "storage_controller": [
+      {
+        "index": 14,
+        "attached_to": 13,
+        "class_list": [
+          "storage_controller",
+          "pci"
+        ],
+        "bus_type": {
+          "hex": "0004",
+          "name": "PCI",
+          "value": 4
+        },
+        "slot": {
+          "bus": 1,
+          "number": 0
+        },
+        "base_class": {
+          "hex": "0001",
+          "name": "Mass storage controller",
+          "value": 1
+        },
+        "sub_class": {
+          "hex": "0008",
+          "value": 8
+        },
+        "pci_interface": {
+          "hex": "0002",
+          "value": 2
+        },
+        "vendor": {
+          "hex": "2646",
+          "value": 9798
+        },
+        "sub_vendor": {
+          "hex": "2646",
+          "value": 9798
+        },
+        "device": {
+          "hex": "2263",
+          "value": 8803
+        },
+        "sub_device": {
+          "hex": "2263",
+          "value": 8803
+        },
+        "revision": {
+          "hex": "0003",
+          "value": 3
+        },
+        "model": "Mass storage controller",
+        "sysfs_id": "/devices/pci0000:00/0000:00:13.0/0000:01:00.0",
+        "sysfs_bus_id": "0000:01:00.0",
+        "resources": [
+          {
+            "type": "irq",
+            "base": 22,
+            "triggered": 0,
+            "enabled": true
+          },
+          {
+            "type": "mem",
+            "base": 2703228928,
+            "range": 16384,
+            "enabled": true,
+            "access": "read_write",
+            "prefetch": "no"
+          }
+        ],
+        "detail": {
+          "function": 0,
+          "command": 1030,
+          "header_type": 0,
+          "secondary_bus": 0,
+          "irq": 22,
+          "prog_if": 2
+        },
+        "driver": "nvme",
+        "driver_module": "nvme",
+        "drivers": [
+          "nvme"
+        ],
+        "driver_modules": [
+          "nvme"
+        ],
+        "module_alias": "pci:v00002646d00002263sv00002646sd00002263bc01sc08i02"
+      },
+      {
+        "index": 18,
+        "attached_to": 0,
+        "class_list": [
+          "storage_controller",
+          "pci"
+        ],
+        "bus_type": {
+          "hex": "0004",
+          "name": "PCI",
+          "value": 4
+        },
+        "slot": {
+          "bus": 0,
+          "number": 18
+        },
+        "base_class": {
+          "hex": "0001",
+          "name": "Mass storage controller",
+          "value": 1
+        },
+        "sub_class": {
+          "hex": "0006",
+          "value": 6
+        },
+        "pci_interface": {
+          "hex": "0001",
+          "value": 1
+        },
+        "vendor": {
+          "hex": "8086",
+          "name": "Intel Corporation",
+          "value": 32902
+        },
+        "sub_vendor": {
+          "hex": "1458",
+          "value": 5208
+        },
+        "device": {
+          "hex": "31e3",
+          "value": 12771
+        },
+        "sub_device": {
+          "hex": "1000",
+          "value": 4096
+        },
+        "revision": {
+          "hex": "0003",
+          "value": 3
+        },
+        "model": "Intel Mass storage controller",
+        "sysfs_id": "/devices/pci0000:00/0000:00:12.0",
+        "sysfs_bus_id": "0000:00:12.0",
+        "resources": [
+          {
+            "type": "io",
+            "base": 61536,
+            "range": 32,
+            "enabled": true,
+            "access": "read_write"
+          },
+          {
+            "type": "io",
+            "base": 61568,
+            "range": 4,
+            "enabled": true,
+            "access": "read_write"
+          },
+          {
+            "type": "io",
+            "base": 61584,
+            "range": 8,
+            "enabled": true,
+            "access": "read_write"
+          },
+          {
+            "type": "irq",
+            "base": 133,
+            "triggered": 0,
+            "enabled": true
+          },
+          {
+            "type": "mem",
+            "base": 2704343040,
+            "range": 8192,
+            "enabled": true,
+            "access": "read_write",
+            "prefetch": "no"
+          },
+          {
+            "type": "mem",
+            "base": 2704371712,
+            "range": 2048,
+            "enabled": true,
+            "access": "read_write",
+            "prefetch": "no"
+          },
+          {
+            "type": "mem",
+            "base": 2704375808,
+            "range": 256,
+            "enabled": true,
+            "access": "read_write",
+            "prefetch": "no"
+          }
+        ],
+        "detail": {
+          "function": 0,
+          "command": 1031,
+          "header_type": 0,
+          "secondary_bus": 0,
+          "irq": 133,
+          "prog_if": 1
+        },
+        "driver": "ahci",
+        "driver_module": "ahci",
+        "drivers": [
+          "ahci"
+        ],
+        "driver_modules": [
+          "ahci"
+        ],
+        "module_alias": "pci:v00008086d000031E3sv00001458sd00001000bc01sc06i01",
+        "label": "Onboard - SATA"
+      }
+    ],
+    "system": {
+      "form_factor": "desktop"
+    },
     "usb_controller": [
       {
         "index": 21,
         "attached_to": 0,
+        "class_list": [
+          "usb_controller",
+          "pci"
+        ],
         "bus_type": {
+          "hex": "0004",
           "name": "PCI",
           "value": 4
         },
@@ -2853,30 +2291,38 @@
           "number": 21
         },
         "base_class": {
+          "hex": "000c",
           "name": "Serial bus controller",
           "value": 12
         },
         "sub_class": {
+          "hex": "0003",
           "name": "USB Controller",
           "value": 3
         },
         "pci_interface": {
+          "hex": "0030",
           "value": 48
         },
         "vendor": {
+          "hex": "8086",
           "name": "Intel Corporation",
           "value": 32902
         },
         "sub_vendor": {
+          "hex": "1458",
           "value": 5208
         },
         "device": {
+          "hex": "31a8",
           "value": 12712
         },
         "sub_device": {
+          "hex": "1000",
           "value": 4096
         },
         "revision": {
+          "hex": "0003",
           "value": 3
         },
         "model": "Intel USB Controller",
@@ -2885,7 +2331,7 @@
         "resources": [
           {
             "type": "irq",
-            "base": 130,
+            "base": 128,
             "triggered": 0,
             "enabled": true
           },
@@ -2903,7 +2349,7 @@
           "command": 1030,
           "header_type": 0,
           "secondary_bus": 0,
-          "irq": 130,
+          "irq": 128,
           "prog_if": 48
         },
         "driver": "xhci_hcd",
@@ -2953,6 +2399,7 @@
       "product": "MZGLKAP-00",
       "version": "1.x",
       "board_type": {
+        "hex": "000a",
         "name": "Motherboard",
         "value": 10
       },
@@ -2971,25 +2418,30 @@
         "size_current": 224,
         "speed": 0,
         "mode": {
+          "hex": "0001",
           "name": "Write Back",
           "value": 1
         },
         "enabled": true,
         "location": {
+          "hex": "0000",
           "name": "Internal",
           "value": 0
         },
         "socketed": false,
         "level": 0,
         "ecc": {
+          "hex": "0004",
           "name": "Parity",
           "value": 4
         },
         "cache_type": {
+          "hex": "0001",
           "name": "Other",
           "value": 1
         },
         "associativity": {
+          "hex": "0001",
           "name": "Other",
           "value": 1
         },
@@ -3007,25 +2459,30 @@
         "size_current": 4096,
         "speed": 0,
         "mode": {
+          "hex": "0001",
           "name": "Write Back",
           "value": 1
         },
         "enabled": true,
         "location": {
+          "hex": "0000",
           "name": "Internal",
           "value": 0
         },
         "socketed": false,
         "level": 1,
         "ecc": {
+          "hex": "0005",
           "name": "Single-bit",
           "value": 5
         },
         "cache_type": {
+          "hex": "0005",
           "name": "Unified",
           "value": 5
         },
         "associativity": {
+          "hex": "0008",
           "name": "16-way Set-Associative",
           "value": 8
         },
@@ -3037,33 +2494,40 @@
         ]
       }
     ],
-    "chassis": {
-      "handle": 3,
-      "manufacturer": "Default string",
-      "version": "Default string",
-      "chassis_type": {
-        "name": "Desktop",
-        "value": 3
-      },
-      "lock_present": false,
-      "bootup_state": {
-        "name": "Safe",
-        "value": 3
-      },
-      "power_state": {
-        "name": "Safe",
-        "value": 3
-      },
-      "thermal_state": {
-        "name": "Safe",
-        "value": 3
-      },
-      "security_state": {
-        "name": "None",
-        "value": 3
-      },
-      "oem": "0x0"
-    },
+    "chassis": [
+      {
+        "handle": 3,
+        "manufacturer": "Default string",
+        "version": "Default string",
+        "chassis_type": {
+          "hex": "0003",
+          "name": "Desktop",
+          "value": 3
+        },
+        "lock_present": false,
+        "bootup_state": {
+          "hex": "0003",
+          "name": "Safe",
+          "value": 3
+        },
+        "power_state": {
+          "hex": "0003",
+          "name": "Safe",
+          "value": 3
+        },
+        "thermal_state": {
+          "hex": "0003",
+          "name": "Safe",
+          "value": 3
+        },
+        "security_state": {
+          "hex": "0003",
+          "name": "None",
+          "value": 3
+        },
+        "oem": "0x0"
+      }
+    ],
     "config": {
       "handle": 34,
       "options": [
@@ -3082,18 +2546,21 @@
       {
         "handle": 35,
         "location": {
+          "hex": "0003",
           "name": "Motherboard",
           "value": 3
         },
         "usage": {
+          "hex": "0003",
           "name": "System memory",
           "value": 3
         },
         "ecc": {
+          "hex": "0003",
           "name": "None",
           "value": 3
         },
-        "max_size": 33554432,
+        "max_size": "0x2000000",
         "error_handle": 65534,
         "slots": 2
       }
@@ -3102,8 +2569,8 @@
       {
         "handle": 36,
         "array_handle": 35,
-        "start_address": 0,
-        "end_address": 17179869184,
+        "start_address": "0x0",
+        "end_address": "0x400000000",
         "part_width": 2
       }
     ],
@@ -3120,11 +2587,13 @@
         "ecc_bits": 0,
         "size": 8388608,
         "form_factor": {
+          "hex": "000d",
           "name": "SODIMM",
           "value": 13
         },
         "set": 0,
         "memory_type": {
+          "hex": "001a",
           "name": "Other",
           "value": 26
         },
@@ -3145,11 +2614,13 @@
         "ecc_bits": 0,
         "size": 8388608,
         "form_factor": {
+          "hex": "000d",
           "name": "SODIMM",
           "value": 13
         },
         "set": 0,
         "memory_type": {
+          "hex": "001a",
           "name": "Other",
           "value": 26
         },
@@ -3164,8 +2635,8 @@
         "handle": 38,
         "memory_device_handle": 37,
         "array_map_handle": 36,
-        "start_address": 0,
-        "end_address": 8589934592,
+        "start_address": "0x0",
+        "end_address": "0x200000000",
         "row_position": 255,
         "interleave_position": 1,
         "interleave_depth": 2
@@ -3174,8 +2645,8 @@
         "handle": 40,
         "memory_device_handle": 39,
         "array_map_handle": 36,
-        "start_address": 8589934592,
-        "end_address": 17179869184,
+        "start_address": "0x200000000",
+        "end_address": "0x400000000",
         "row_position": 255,
         "interleave_position": 2,
         "interleave_depth": 2
@@ -3188,6 +2659,7 @@
           {
             "name": "To Be Filled By O.E.M.",
             "type": {
+              "hex": "0003",
               "name": "Video",
               "value": 3
             },
@@ -3200,11 +2672,13 @@
       {
         "handle": 8,
         "port_type": {
+          "hex": "000e",
           "name": "Mouse Port",
           "value": 14
         },
         "internal_reference_designator": "J1A1",
         "external_connector_type": {
+          "hex": "000f",
           "name": "PS/2",
           "value": 15
         },
@@ -3213,11 +2687,13 @@
       {
         "handle": 9,
         "port_type": {
+          "hex": "000d",
           "name": "Keyboard Port",
           "value": 13
         },
         "internal_reference_designator": "J1A1",
         "external_connector_type": {
+          "hex": "000f",
           "name": "PS/2",
           "value": 15
         },
@@ -3226,11 +2702,13 @@
       {
         "handle": 10,
         "port_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
         "internal_reference_designator": "J2A1",
         "external_connector_type": {
+          "hex": "001d",
           "name": "Mini-Centronics Type-14",
           "value": 29
         },
@@ -3239,11 +2717,13 @@
       {
         "handle": 11,
         "port_type": {
+          "hex": "0009",
           "name": "Serial Port 16550A Compatible",
           "value": 9
         },
         "internal_reference_designator": "J2A2A",
         "external_connector_type": {
+          "hex": "0008",
           "name": "DB-9 pin male",
           "value": 8
         },
@@ -3252,11 +2732,13 @@
       {
         "handle": 12,
         "port_type": {
+          "hex": "001c",
           "name": "Video Port",
           "value": 28
         },
         "internal_reference_designator": "J2A2B",
         "external_connector_type": {
+          "hex": "0007",
           "name": "DB-15 pin female",
           "value": 7
         },
@@ -3265,11 +2747,13 @@
       {
         "handle": 13,
         "port_type": {
+          "hex": "0010",
           "name": "USB",
           "value": 16
         },
         "internal_reference_designator": "J3A1",
         "external_connector_type": {
+          "hex": "0012",
           "name": "Access Bus [USB]",
           "value": 18
         },
@@ -3278,11 +2762,13 @@
       {
         "handle": 14,
         "port_type": {
+          "hex": "0010",
           "name": "USB",
           "value": 16
         },
         "internal_reference_designator": "J3A1",
         "external_connector_type": {
+          "hex": "0012",
           "name": "Access Bus [USB]",
           "value": 18
         },
@@ -3291,11 +2777,13 @@
       {
         "handle": 15,
         "port_type": {
+          "hex": "0010",
           "name": "USB",
           "value": 16
         },
         "internal_reference_designator": "J3A1",
         "external_connector_type": {
+          "hex": "0012",
           "name": "Access Bus [USB]",
           "value": 18
         },
@@ -3304,10 +2792,12 @@
       {
         "handle": 16,
         "port_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
         "internal_connector_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
@@ -3316,10 +2806,12 @@
       {
         "handle": 17,
         "port_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
         "internal_connector_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
@@ -3328,10 +2820,12 @@
       {
         "handle": 18,
         "port_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
         "internal_connector_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
@@ -3340,10 +2834,12 @@
       {
         "handle": 19,
         "port_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
         "internal_connector_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
@@ -3352,10 +2848,12 @@
       {
         "handle": 20,
         "port_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
         "internal_connector_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
@@ -3364,10 +2862,12 @@
       {
         "handle": 21,
         "port_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
         "internal_connector_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
@@ -3376,10 +2876,12 @@
       {
         "handle": 22,
         "port_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
         "internal_connector_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
@@ -3388,10 +2890,12 @@
       {
         "handle": 23,
         "port_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
         "internal_connector_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
@@ -3400,10 +2904,12 @@
       {
         "handle": 24,
         "port_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
         "internal_connector_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
@@ -3412,10 +2918,12 @@
       {
         "handle": 25,
         "port_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
         "internal_connector_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
@@ -3424,10 +2932,12 @@
       {
         "handle": 26,
         "port_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
         "internal_connector_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
@@ -3436,10 +2946,12 @@
       {
         "handle": 27,
         "port_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
         "internal_connector_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
@@ -3448,10 +2960,12 @@
       {
         "handle": 28,
         "port_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
         "internal_connector_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
@@ -3460,10 +2974,12 @@
       {
         "handle": 29,
         "port_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
         "internal_connector_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
@@ -3472,10 +2988,12 @@
       {
         "handle": 30,
         "port_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
         "internal_connector_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
@@ -3484,10 +3002,12 @@
       {
         "handle": 31,
         "port_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
         "internal_connector_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
@@ -3499,6 +3019,7 @@
         "handle": 49,
         "socket": "SOCKET 0",
         "socket_type": {
+          "hex": "0001",
           "name": "Other",
           "value": 1
         },
@@ -3507,14 +3028,17 @@
         "version": "Intel(R) Celeron(R) J4105 CPU @ 1.50GHz",
         "part": "Fill By OEM",
         "processor_type": {
+          "hex": "0003",
           "name": "CPU",
           "value": 3
         },
         "processor_family": {
+          "hex": "000f",
           "name": "Celeron",
           "value": 15
         },
         "processor_status": {
+          "hex": "0001",
           "name": "Enabled",
           "value": 1
         },
@@ -3530,18 +3054,22 @@
         "handle": 64,
         "designation": "J7H1",
         "slot_type": {
+          "hex": "00ae",
           "name": "Other",
           "value": 174
         },
         "bus_width": {
+          "hex": "000a",
           "name": "Other",
           "value": 10
         },
         "usage": {
+          "hex": "0004",
           "name": "In Use",
           "value": 4
         },
         "length": {
+          "hex": "0003",
           "name": "Short",
           "value": 3
         },
@@ -3556,18 +3084,22 @@
         "handle": 65,
         "designation": "J8H1",
         "slot_type": {
+          "hex": "00ad",
           "name": "Other",
           "value": 173
         },
         "bus_width": {
+          "hex": "0009",
           "name": "Other",
           "value": 9
         },
         "usage": {
+          "hex": "0003",
           "name": "Available",
           "value": 3
         },
         "length": {
+          "hex": "0003",
           "name": "Short",
           "value": 3
         },
@@ -3585,6 +3117,7 @@
       "product": "MZGLKAP-00",
       "version": "1.x",
       "wake_up": {
+        "hex": "0006",
         "name": "Power Switch",
         "value": 6
       }
diff --git a/machines/lewis/facter.json b/machines/lewis/facter.json
index 3c634c5..6bb3a7e 100644
--- a/machines/lewis/facter.json
+++ b/machines/lewis/facter.json
@@ -23,9 +23,14 @@
     },
     "bluetooth": [
       {
-        "index": 72,
-        "attached_to": 73,
+        "index": 26,
+        "attached_to": 27,
+        "class_list": [
+          "usb",
+          "bluetooth"
+        ],
         "bus_type": {
+          "hex": "0086",
           "name": "USB",
           "value": 134
         },
@@ -34,16 +39,20 @@
           "number": 0
         },
         "base_class": {
+          "hex": "0115",
           "name": "Bluetooth Device",
           "value": 277
         },
         "vendor": {
+          "hex": "8087",
           "value": 32903
         },
         "device": {
+          "hex": "0aa7",
           "value": 2727
         },
         "revision": {
+          "hex": "0000",
           "name": "0.01",
           "value": 0
         },
@@ -62,19 +71,23 @@
         ],
         "detail": {
           "device_class": {
+            "hex": "00e0",
             "name": "wireless",
             "value": 224
           },
           "device_subclass": {
+            "hex": "0001",
             "name": "audio",
             "value": 1
           },
           "device_protocol": 1,
           "interface_class": {
+            "hex": "00e0",
             "name": "wireless",
             "value": 224
           },
           "interface_subclass": {
+            "hex": "0001",
             "name": "audio",
             "value": 1
           },
@@ -94,9 +107,14 @@
         "module_alias": "usb:v8087p0AA7d0001dcE0dsc01dp01icE0isc01ip01in00"
       },
       {
-        "index": 74,
-        "attached_to": 73,
+        "index": 28,
+        "attached_to": 27,
+        "class_list": [
+          "usb",
+          "bluetooth"
+        ],
         "bus_type": {
+          "hex": "0086",
           "name": "USB",
           "value": 134
         },
@@ -105,16 +123,20 @@
           "number": 0
         },
         "base_class": {
+          "hex": "0115",
           "name": "Bluetooth Device",
           "value": 277
         },
         "vendor": {
+          "hex": "8087",
           "value": 32903
         },
         "device": {
+          "hex": "0aa7",
           "value": 2727
         },
         "revision": {
+          "hex": "0000",
           "name": "0.01",
           "value": 0
         },
@@ -133,19 +155,23 @@
         ],
         "detail": {
           "device_class": {
+            "hex": "00e0",
             "name": "wireless",
             "value": 224
           },
           "device_subclass": {
+            "hex": "0001",
             "name": "audio",
             "value": 1
           },
           "device_protocol": 1,
           "interface_class": {
+            "hex": "00e0",
             "name": "wireless",
             "value": 224
           },
           "interface_subclass": {
+            "hex": "0001",
             "name": "audio",
             "value": 1
           },
@@ -169,7 +195,12 @@
       {
         "index": 10,
         "attached_to": 0,
+        "class_list": [
+          "pci",
+          "bridge"
+        ],
         "bus_type": {
+          "hex": "0004",
           "name": "PCI",
           "value": 4
         },
@@ -178,27 +209,34 @@
           "number": 31
         },
         "base_class": {
+          "hex": "0006",
           "name": "Bridge",
           "value": 6
         },
         "sub_class": {
+          "hex": "0001",
           "name": "ISA bridge",
           "value": 1
         },
         "vendor": {
+          "hex": "8086",
           "name": "Intel Corporation",
           "value": 32902
         },
         "sub_vendor": {
+          "hex": "1458",
           "value": 5208
         },
         "device": {
+          "hex": "31e8",
           "value": 12776
         },
         "sub_device": {
+          "hex": "1000",
           "value": 4096
         },
         "revision": {
+          "hex": "0003",
           "value": 3
         },
         "model": "Intel ISA bridge",
@@ -212,13 +250,26 @@
           "irq": 0,
           "prog_if": 0
         },
+        "driver": "lpc_ich",
+        "driver_module": "lpc_ich",
+        "drivers": [
+          "lpc_ich"
+        ],
+        "driver_modules": [
+          "lpc_ich"
+        ],
         "module_alias": "pci:v00008086d000031E8sv00001458sd00001000bc06sc01i00",
         "label": "Onboard - Other"
       },
       {
         "index": 11,
         "attached_to": 0,
+        "class_list": [
+          "pci",
+          "bridge"
+        ],
         "bus_type": {
+          "hex": "0004",
           "name": "PCI",
           "value": 4
         },
@@ -227,31 +278,39 @@
           "number": 19
         },
         "base_class": {
+          "hex": "0006",
           "name": "Bridge",
           "value": 6
         },
         "sub_class": {
+          "hex": "0004",
           "name": "PCI bridge",
           "value": 4
         },
         "pci_interface": {
+          "hex": "0000",
           "name": "Normal decode",
           "value": 0
         },
         "vendor": {
+          "hex": "8086",
           "name": "Intel Corporation",
           "value": 32902
         },
         "sub_vendor": {
+          "hex": "1458",
           "value": 5208
         },
         "device": {
+          "hex": "31da",
           "value": 12762
         },
         "sub_device": {
+          "hex": "1000",
           "value": 4096
         },
         "revision": {
+          "hex": "00f3",
           "value": 243
         },
         "model": "Intel PCI bridge",
@@ -260,7 +319,7 @@
         "resources": [
           {
             "type": "irq",
-            "base": 123,
+            "base": 121,
             "triggered": 0,
             "enabled": true
           }
@@ -270,19 +329,28 @@
           "command": 1031,
           "header_type": 1,
           "secondary_bus": 2,
-          "irq": 123,
+          "irq": 121,
           "prog_if": 0
         },
         "driver": "pcieport",
+        "driver_module": "pcieportdrv",
         "drivers": [
           "pcieport"
         ],
+        "driver_modules": [
+          "pcieportdrv"
+        ],
         "module_alias": "pci:v00008086d000031DAsv00001458sd00001000bc06sc04i00"
       },
       {
         "index": 13,
         "attached_to": 0,
+        "class_list": [
+          "pci",
+          "bridge"
+        ],
         "bus_type": {
+          "hex": "0004",
           "name": "PCI",
           "value": 4
         },
@@ -291,31 +359,39 @@
           "number": 19
         },
         "base_class": {
+          "hex": "0006",
           "name": "Bridge",
           "value": 6
         },
         "sub_class": {
+          "hex": "0004",
           "name": "PCI bridge",
           "value": 4
         },
         "pci_interface": {
+          "hex": "0000",
           "name": "Normal decode",
           "value": 0
         },
         "vendor": {
+          "hex": "8086",
           "name": "Intel Corporation",
           "value": 32902
         },
         "sub_vendor": {
+          "hex": "1458",
           "value": 5208
         },
         "device": {
+          "hex": "31d8",
           "value": 12760
         },
         "sub_device": {
+          "hex": "1000",
           "value": 4096
         },
         "revision": {
+          "hex": "00f3",
           "value": 243
         },
         "model": "Intel PCI bridge",
@@ -324,7 +400,7 @@
         "resources": [
           {
             "type": "irq",
-            "base": 122,
+            "base": 120,
             "triggered": 0,
             "enabled": true
           }
@@ -334,19 +410,28 @@
           "command": 1031,
           "header_type": 1,
           "secondary_bus": 1,
-          "irq": 122,
+          "irq": 120,
           "prog_if": 0
         },
         "driver": "pcieport",
+        "driver_module": "pcieportdrv",
         "drivers": [
           "pcieport"
         ],
+        "driver_modules": [
+          "pcieportdrv"
+        ],
         "module_alias": "pci:v00008086d000031D8sv00001458sd00001000bc06sc04i00"
       },
       {
         "index": 17,
         "attached_to": 0,
+        "class_list": [
+          "pci",
+          "bridge"
+        ],
         "bus_type": {
+          "hex": "0004",
           "name": "PCI",
           "value": 4
         },
@@ -355,27 +440,34 @@
           "number": 0
         },
         "base_class": {
+          "hex": "0006",
           "name": "Bridge",
           "value": 6
         },
         "sub_class": {
+          "hex": "0000",
           "name": "Host bridge",
           "value": 0
         },
         "vendor": {
+          "hex": "8086",
           "name": "Intel Corporation",
           "value": 32902
         },
         "sub_vendor": {
+          "hex": "1458",
           "value": 5208
         },
         "device": {
+          "hex": "31f0",
           "value": 12784
         },
         "sub_device": {
+          "hex": "1000",
           "value": 4096
         },
         "revision": {
+          "hex": "0003",
           "value": 3
         },
         "model": "Intel Host bridge",
@@ -395,7 +487,12 @@
       {
         "index": 20,
         "attached_to": 0,
+        "class_list": [
+          "pci",
+          "bridge"
+        ],
         "bus_type": {
+          "hex": "0004",
           "name": "PCI",
           "value": 4
         },
@@ -404,31 +501,39 @@
           "number": 19
         },
         "base_class": {
+          "hex": "0006",
           "name": "Bridge",
           "value": 6
         },
         "sub_class": {
+          "hex": "0004",
           "name": "PCI bridge",
           "value": 4
         },
         "pci_interface": {
+          "hex": "0000",
           "name": "Normal decode",
           "value": 0
         },
         "vendor": {
+          "hex": "8086",
           "name": "Intel Corporation",
           "value": 32902
         },
         "sub_vendor": {
+          "hex": "1458",
           "value": 5208
         },
         "device": {
+          "hex": "31db",
           "value": 12763
         },
         "sub_device": {
+          "hex": "1000",
           "value": 4096
         },
         "revision": {
+          "hex": "00f3",
           "value": 243
         },
         "model": "Intel PCI bridge",
@@ -437,7 +542,7 @@
         "resources": [
           {
             "type": "irq",
-            "base": 124,
+            "base": 122,
             "triggered": 0,
             "enabled": true
           }
@@ -447,13 +552,17 @@
           "command": 1031,
           "header_type": 1,
           "secondary_bus": 3,
-          "irq": 124,
+          "irq": 122,
           "prog_if": 0
         },
         "driver": "pcieport",
+        "driver_module": "pcieportdrv",
         "drivers": [
           "pcieport"
         ],
+        "driver_modules": [
+          "pcieportdrv"
+        ],
         "module_alias": "pci:v00008086d000031DBsv00001458sd00001000bc06sc04i00"
       }
     ],
@@ -461,6 +570,7 @@
       {
         "architecture": "x86_64",
         "vendor_name": "GenuineIntel",
+        "model_name": "Intel(R) Celeron(R) J4105 CPU @ 1.50GHz",
         "family": 6,
         "model": 122,
         "stepping": 1,
@@ -582,278 +692,38 @@
           "rfds",
           "bhi"
         ],
+        "power_management": [
+          ""
+        ],
         "bogo": 2995.2,
         "cache": 4096,
         "units": 64,
         "physical_id": 0,
         "siblings": 4,
         "cores": 4,
-        "fpu": true,
-        "fpu_exception": true,
+        "fpu": false,
+        "fpu_exception": false,
         "cpuid_level": 24,
         "write_protect": false,
         "clflush_size": 64,
         "cache_alignment": 64,
         "address_sizes": {
-          "physical": 39,
-          "virtual": 48
+          "physical": "0x27",
+          "virtual": "0x30"
         }
       }
     ],
     "disk": [
       {
         "index": 24,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 25,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Disk",
-          "value": 0
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "VIRTUAL-DISK",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "serial": "beaf231",
-        "model": "IET VIRTUAL-DISK",
-        "sysfs_id": "/class/block/sdy",
-        "sysfs_bus_id": "25:0:0:1",
-        "sysfs_device_link": "/devices/platform/host25/session163/target25:0:0/25:0:0:1",
-        "unix_device_name": "/dev/sdy",
-        "unix_device_number": {
-          "type": 98,
-          "major": 65,
-          "minor": 128,
-          "range": 16
-        },
-        "unix_device_names": [
-          "/dev/disk/by-diskseq/176",
-          "/dev/disk/by-id/scsi-360000000000000000e00000000170001",
-          "/dev/disk/by-id/wwn-0x60000000000000000e00000000170001",
-          "/dev/disk/by-path/ip-10.42.2.244:3260-iscsi-iqn.2019-10.io.longhorn:ntfy-lun-1",
-          "/dev/disk/by-uuid/7ae09e5a-8909-416c-903e-faeaf8b9ebf7",
-          "/dev/sdy"
-        ],
-        "unix_device_name2": "/dev/sg36",
-        "unix_device_number2": {
-          "type": 99,
-          "major": 21,
-          "minor": 36,
-          "range": 1
-        },
-        "resources": [
-          {
-            "type": "disk_geo",
-            "cylinders": 1024,
-            "heads": 10,
-            "sectors": 60,
-            "size": 0,
-            "geo_type": "logical"
-          },
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 614400,
-            "value_2": 512
-          }
-        ],
-        "driver": "sd",
-        "driver_module": "sd_mod",
-        "drivers": [
-          "sd"
-        ],
-        "driver_modules": [
-          "sd_mod"
-        ]
-      },
-      {
-        "index": 25,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 6,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Disk",
-          "value": 0
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "VIRTUAL-DISK",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "serial": "beaf31",
-        "model": "IET VIRTUAL-DISK",
-        "sysfs_id": "/class/block/sdf",
-        "sysfs_bus_id": "6:0:0:1",
-        "sysfs_device_link": "/devices/platform/host6/session521/target6:0:0/6:0:0:1",
-        "unix_device_name": "/dev/sdf",
-        "unix_device_number": {
-          "type": 98,
-          "major": 8,
-          "minor": 80,
-          "range": 16
-        },
-        "unix_device_names": [
-          "/dev/disk/by-diskseq/552",
-          "/dev/disk/by-id/scsi-360000000000000000e00000000030001",
-          "/dev/disk/by-id/wwn-0x60000000000000000e00000000030001",
-          "/dev/disk/by-path/ip-10.42.2.229:3260-iscsi-iqn.2019-10.io.longhorn:nextcloud-lun-1",
-          "/dev/disk/by-uuid/9ad442ea-127e-4f66-8cf8-4f7a69932806",
-          "/dev/sdf"
-        ],
-        "unix_device_name2": "/dev/sg40",
-        "unix_device_number2": {
-          "type": 99,
-          "major": 21,
-          "minor": 40,
-          "range": 1
-        },
-        "resources": [
-          {
-            "type": "disk_geo",
-            "cylinders": 51200,
-            "heads": 64,
-            "sectors": 32,
-            "size": 0,
-            "geo_type": "logical"
-          },
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 104857600,
-            "value_2": 512
-          }
-        ],
-        "driver": "sd",
-        "driver_module": "sd_mod",
-        "drivers": [
-          "sd"
-        ],
-        "driver_modules": [
-          "sd_mod"
-        ]
-      },
-      {
-        "index": 26,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 28,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Disk",
-          "value": 0
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "VIRTUAL-DISK",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "serial": "beaf271",
-        "model": "IET VIRTUAL-DISK",
-        "sysfs_id": "/class/block/sdab",
-        "sysfs_bus_id": "28:0:0:1",
-        "sysfs_device_link": "/devices/platform/host28/session123/target28:0:0/28:0:0:1",
-        "unix_device_name": "/dev/sdab",
-        "unix_device_number": {
-          "type": 98,
-          "major": 65,
-          "minor": 176,
-          "range": 16
-        },
-        "unix_device_names": [
-          "/dev/disk/by-diskseq/136",
-          "/dev/disk/by-id/scsi-360000000000000000e000000001b0001",
-          "/dev/disk/by-id/wwn-0x60000000000000000e000000001b0001",
-          "/dev/disk/by-path/ip-10.42.2.244:3260-iscsi-iqn.2019-10.io.longhorn:attic-db-lun-1",
-          "/dev/disk/by-uuid/6940ecd4-614f-41db-a4f5-9171f5498519",
-          "/dev/sdab"
-        ],
-        "unix_device_name2": "/dev/sg10",
-        "unix_device_number2": {
-          "type": 99,
-          "major": 21,
-          "minor": 10,
-          "range": 1
-        },
-        "resources": [
-          {
-            "type": "disk_geo",
-            "cylinders": 1024,
-            "heads": 5,
-            "sectors": 60,
-            "size": 0,
-            "geo_type": "logical"
-          },
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 307200,
-            "value_2": 512
-          }
-        ],
-        "driver": "sd",
-        "driver_module": "sd_mod",
-        "drivers": [
-          "sd"
-        ],
-        "driver_modules": [
-          "sd_mod"
-        ]
-      },
-      {
-        "index": 27,
         "attached_to": 14,
+        "class_list": [
+          "disk",
+          "block_device",
+          "nvme"
+        ],
         "bus_type": {
+          "hex": "0096",
           "name": "NVME",
           "value": 150
         },
@@ -862,24 +732,30 @@
           "number": 0
         },
         "base_class": {
+          "hex": "0106",
           "name": "Mass Storage Device",
           "value": 262
         },
         "sub_class": {
+          "hex": "0000",
           "name": "Disk",
           "value": 0
         },
         "vendor": {
+          "hex": "2646",
           "value": 9798
         },
         "sub_vendor": {
+          "hex": "2646",
           "value": 9798
         },
         "device": {
+          "hex": "5017",
           "name": "KINGSTON SNV2S1000G",
           "value": 20503
         },
         "sub_device": {
+          "hex": "5017",
           "value": 20503
         },
         "serial": "50026B76862833F0",
@@ -895,7 +771,6 @@
           "range": 0
         },
         "unix_device_names": [
-          "/dev/disk/by-diskseq/1",
           "/dev/disk/by-id/nvme-KINGSTON_SNV2S1000G_50026B76862833F0",
           "/dev/disk/by-id/nvme-KINGSTON_SNV2S1000G_50026B76862833F0_1",
           "/dev/disk/by-id/nvme-eui.00000000000000000026b76862833f05",
@@ -908,7 +783,7 @@
             "cylinders": 953869,
             "heads": 64,
             "sectors": 32,
-            "size": 0,
+            "size": "0x0",
             "geo_type": "logical"
           },
           {
@@ -928,1414 +803,15 @@
         ]
       },
       {
-        "index": 28,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 15,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Disk",
-          "value": 0
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "VIRTUAL-DISK",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "serial": "beaf181",
-        "model": "IET VIRTUAL-DISK",
-        "sysfs_id": "/class/block/sdo",
-        "sysfs_bus_id": "15:0:0:1",
-        "sysfs_device_link": "/devices/platform/host15/session141/target15:0:0/15:0:0:1",
-        "unix_device_name": "/dev/sdo",
-        "unix_device_number": {
-          "type": 98,
-          "major": 8,
-          "minor": 224,
-          "range": 16
-        },
-        "unix_device_names": [
-          "/dev/disk/by-diskseq/154",
-          "/dev/disk/by-id/scsi-360000000000000000e00000000120001",
-          "/dev/disk/by-id/wwn-0x60000000000000000e00000000120001",
-          "/dev/disk/by-path/ip-10.42.2.244:3260-iscsi-iqn.2019-10.io.longhorn:hedgedoc-uploads-lun-1",
-          "/dev/disk/by-uuid/a852f0d1-e4fa-43c4-9789-270d29a24025",
-          "/dev/sdo"
-        ],
-        "unix_device_name2": "/dev/sg12",
-        "unix_device_number2": {
-          "type": 99,
-          "major": 21,
-          "minor": 12,
-          "range": 1
-        },
-        "resources": [
-          {
-            "type": "disk_geo",
-            "cylinders": 1024,
-            "heads": 2,
-            "sectors": 50,
-            "size": 0,
-            "geo_type": "logical"
-          },
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 102400,
-            "value_2": 512
-          }
-        ],
-        "driver": "sd",
-        "driver_module": "sd_mod",
-        "drivers": [
-          "sd"
-        ],
-        "driver_modules": [
-          "sd_mod"
-        ]
-      },
-      {
-        "index": 29,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 23,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Disk",
-          "value": 0
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "VIRTUAL-DISK",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "serial": "beaf211",
-        "model": "IET VIRTUAL-DISK",
-        "sysfs_id": "/class/block/sdw",
-        "sysfs_bus_id": "23:0:0:1",
-        "sysfs_device_link": "/devices/platform/host23/session161/target23:0:0/23:0:0:1",
-        "unix_device_name": "/dev/sdw",
-        "unix_device_number": {
-          "type": 98,
-          "major": 65,
-          "minor": 96,
-          "range": 16
-        },
-        "unix_device_names": [
-          "/dev/disk/by-diskseq/174",
-          "/dev/disk/by-id/scsi-360000000000000000e00000000150001",
-          "/dev/disk/by-id/wwn-0x60000000000000000e00000000150001",
-          "/dev/disk/by-path/ip-10.42.2.244:3260-iscsi-iqn.2019-10.io.longhorn:pvc-8562af07-b250-4e87-9ebd-3bcad23a3b54-lun-1",
-          "/dev/disk/by-uuid/614ccde9-d82f-4b8d-bffe-f427743618de",
-          "/dev/sdw"
-        ],
-        "unix_device_name2": "/dev/sg32",
-        "unix_device_number2": {
-          "type": 99,
-          "major": 21,
-          "minor": 32,
-          "range": 1
-        },
-        "resources": [
-          {
-            "type": "disk_geo",
-            "cylinders": 1020,
-            "heads": 17,
-            "sectors": 59,
-            "size": 0,
-            "geo_type": "logical"
-          },
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 1024000,
-            "value_2": 512
-          }
-        ],
-        "driver": "sd",
-        "driver_module": "sd_mod",
-        "drivers": [
-          "sd"
-        ],
-        "driver_modules": [
-          "sd_mod"
-        ]
-      },
-      {
-        "index": 30,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 4,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Disk",
-          "value": 0
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "VIRTUAL-DISK",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "serial": "beaf151",
-        "model": "IET VIRTUAL-DISK",
-        "sysfs_id": "/class/block/sdd",
-        "sysfs_bus_id": "4:0:0:1",
-        "sysfs_device_link": "/devices/platform/host4/session37/target4:0:0/4:0:0:1",
-        "unix_device_name": "/dev/sdd",
-        "unix_device_number": {
-          "type": 98,
-          "major": 8,
-          "minor": 48,
-          "range": 16
-        },
-        "unix_device_names": [
-          "/dev/disk/by-diskseq/50",
-          "/dev/disk/by-id/scsi-360000000000000000e000000000f0001",
-          "/dev/disk/by-id/wwn-0x60000000000000000e000000000f0001",
-          "/dev/disk/by-path/ip-10.42.2.244:3260-iscsi-iqn.2019-10.io.longhorn:hedgedoc-db-lun-1",
-          "/dev/sdd"
-        ],
-        "unix_device_name2": "/dev/sg6",
-        "unix_device_number2": {
-          "type": 99,
-          "major": 21,
-          "minor": 6,
-          "range": 1
-        },
-        "resources": [
-          {
-            "type": "disk_geo",
-            "cylinders": 1024,
-            "heads": 4,
-            "sectors": 50,
-            "size": 0,
-            "geo_type": "logical"
-          },
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 204800,
-            "value_2": 512
-          }
-        ],
-        "driver": "sd",
-        "driver_module": "sd_mod",
-        "drivers": [
-          "sd"
-        ],
-        "driver_modules": [
-          "sd_mod"
-        ]
-      },
-      {
-        "index": 31,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 13,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Disk",
-          "value": 0
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "VIRTUAL-DISK",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "serial": "beaf121",
-        "model": "IET VIRTUAL-DISK",
-        "sysfs_id": "/class/block/sdm",
-        "sysfs_bus_id": "13:0:0:1",
-        "sysfs_device_link": "/devices/platform/host13/session156/target13:0:0/13:0:0:1",
-        "unix_device_name": "/dev/sdm",
-        "unix_device_number": {
-          "type": 98,
-          "major": 8,
-          "minor": 192,
-          "range": 16
-        },
-        "unix_device_names": [
-          "/dev/disk/by-diskseq/169",
-          "/dev/disk/by-id/scsi-360000000000000000e000000000c0001",
-          "/dev/disk/by-id/wwn-0x60000000000000000e000000000c0001",
-          "/dev/disk/by-path/ip-10.42.2.244:3260-iscsi-iqn.2019-10.io.longhorn:prowlarr-lun-1",
-          "/dev/disk/by-uuid/485930ae-2fe2-4470-b99a-dc61a93d921c",
-          "/dev/sdm"
-        ],
-        "unix_device_name2": "/dev/sg24",
-        "unix_device_number2": {
-          "type": 99,
-          "major": 21,
-          "minor": 24,
-          "range": 1
-        },
-        "resources": [
-          {
-            "type": "disk_geo",
-            "cylinders": 1024,
-            "heads": 5,
-            "sectors": 60,
-            "size": 0,
-            "geo_type": "logical"
-          },
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 307200,
-            "value_2": 512
-          }
-        ],
-        "driver": "sd",
-        "driver_module": "sd_mod",
-        "drivers": [
-          "sd"
-        ],
-        "driver_modules": [
-          "sd_mod"
-        ]
-      },
-      {
-        "index": 32,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 21,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Disk",
-          "value": 0
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "VIRTUAL-DISK",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "serial": "beaf191",
-        "model": "IET VIRTUAL-DISK",
-        "sysfs_id": "/class/block/sdu",
-        "sysfs_bus_id": "21:0:0:1",
-        "sysfs_device_link": "/devices/platform/host21/session159/target21:0:0/21:0:0:1",
-        "unix_device_name": "/dev/sdu",
-        "unix_device_number": {
-          "type": 98,
-          "major": 65,
-          "minor": 64,
-          "range": 16
-        },
-        "unix_device_names": [
-          "/dev/disk/by-diskseq/172",
-          "/dev/disk/by-id/scsi-360000000000000000e00000000130001",
-          "/dev/disk/by-id/wwn-0x60000000000000000e00000000130001",
-          "/dev/disk/by-path/ip-10.42.2.244:3260-iscsi-iqn.2019-10.io.longhorn:pvc-2848b393-989a-4a12-b155-59d67313c20b-lun-1",
-          "/dev/disk/by-uuid/4ffb4dc3-e48b-4e74-9678-5693227cb1cf",
-          "/dev/sdu"
-        ],
-        "unix_device_name2": "/dev/sg30",
-        "unix_device_number2": {
-          "type": 99,
-          "major": 21,
-          "minor": 30,
-          "range": 1
-        },
-        "resources": [
-          {
-            "type": "disk_geo",
-            "cylinders": 1024,
-            "heads": 10,
-            "sectors": 60,
-            "size": 0,
-            "geo_type": "logical"
-          },
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 614400,
-            "value_2": 512
-          }
-        ],
-        "driver": "sd",
-        "driver_module": "sd_mod",
-        "drivers": [
-          "sd"
-        ],
-        "driver_modules": [
-          "sd_mod"
-        ]
-      },
-      {
-        "index": 33,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 2,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Disk",
-          "value": 0
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "VIRTUAL-DISK",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "serial": "beaf11",
-        "model": "IET VIRTUAL-DISK",
-        "sysfs_id": "/class/block/sdb",
-        "sysfs_bus_id": "2:0:0:1",
-        "sysfs_device_link": "/devices/platform/host2/session1/target2:0:0/2:0:0:1",
-        "unix_device_name": "/dev/sdb",
-        "unix_device_number": {
-          "type": 98,
-          "major": 8,
-          "minor": 16,
-          "range": 16
-        },
-        "unix_device_names": [
-          "/dev/disk/by-diskseq/14",
-          "/dev/disk/by-id/scsi-360000000000000000e00000000010001",
-          "/dev/disk/by-id/wwn-0x60000000000000000e00000000010001",
-          "/dev/disk/by-path/ip-10.42.2.244:3260-iscsi-iqn.2019-10.io.longhorn:pvc-09c264fc-dace-4bbe-88ae-555d96e6c956-lun-1",
-          "/dev/sdb"
-        ],
-        "unix_device_name2": "/dev/sg2",
-        "unix_device_number2": {
-          "type": 99,
-          "major": 21,
-          "minor": 2,
-          "range": 1
-        },
-        "resources": [
-          {
-            "type": "disk_geo",
-            "cylinders": 20480,
-            "heads": 64,
-            "sectors": 32,
-            "size": 0,
-            "geo_type": "logical"
-          },
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 41943040,
-            "value_2": 512
-          }
-        ],
-        "driver": "sd",
-        "driver_module": "sd_mod",
-        "drivers": [
-          "sd"
-        ],
-        "driver_modules": [
-          "sd_mod"
-        ]
-      },
-      {
-        "index": 34,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 11,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Disk",
-          "value": 0
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "VIRTUAL-DISK",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "serial": "beaf101",
-        "model": "IET VIRTUAL-DISK",
-        "sysfs_id": "/class/block/sdk",
-        "sysfs_bus_id": "11:0:0:1",
-        "sysfs_device_link": "/devices/platform/host11/session51/target11:0:0/11:0:0:1",
-        "unix_device_name": "/dev/sdk",
-        "unix_device_number": {
-          "type": 98,
-          "major": 8,
-          "minor": 160,
-          "range": 16
-        },
-        "unix_device_names": [
-          "/dev/disk/by-diskseq/64",
-          "/dev/disk/by-id/scsi-360000000000000000e000000000a0001",
-          "/dev/disk/by-id/wwn-0x60000000000000000e000000000a0001",
-          "/dev/disk/by-path/ip-10.42.2.244:3260-iscsi-iqn.2019-10.io.longhorn:immich-db-lun-1",
-          "/dev/disk/by-uuid/b2aeda75-49fa-4d68-8949-9effd8931753",
-          "/dev/sdk"
-        ],
-        "unix_device_name2": "/dev/sg8",
-        "unix_device_number2": {
-          "type": 99,
-          "major": 21,
-          "minor": 8,
-          "range": 1
-        },
-        "resources": [
-          {
-            "type": "disk_geo",
-            "cylinders": 1018,
-            "heads": 166,
-            "sectors": 62,
-            "size": 0,
-            "geo_type": "logical"
-          },
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 10485760,
-            "value_2": 512
-          }
-        ],
-        "driver": "sd",
-        "driver_module": "sd_mod",
-        "drivers": [
-          "sd"
-        ],
-        "driver_modules": [
-          "sd_mod"
-        ]
-      },
-      {
-        "index": 35,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 19,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Disk",
-          "value": 0
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "VIRTUAL-DISK",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "serial": "beaf161",
-        "model": "IET VIRTUAL-DISK",
-        "sysfs_id": "/class/block/sds",
-        "sysfs_bus_id": "19:0:0:1",
-        "sysfs_device_link": "/devices/platform/host19/session158/target19:0:0/19:0:0:1",
-        "unix_device_name": "/dev/sds",
-        "unix_device_number": {
-          "type": 98,
-          "major": 65,
-          "minor": 32,
-          "range": 16
-        },
-        "unix_device_names": [
-          "/dev/disk/by-diskseq/171",
-          "/dev/disk/by-id/scsi-360000000000000000e00000000100001",
-          "/dev/disk/by-id/wwn-0x60000000000000000e00000000100001",
-          "/dev/disk/by-path/ip-10.42.2.244:3260-iscsi-iqn.2019-10.io.longhorn:jellyseerr-lun-1",
-          "/dev/disk/by-uuid/2fbc120d-0631-4d48-814a-49fa1c91c607",
-          "/dev/sds"
-        ],
-        "unix_device_name2": "/dev/sg28",
-        "unix_device_number2": {
-          "type": 99,
-          "major": 21,
-          "minor": 28,
-          "range": 1
-        },
-        "resources": [
-          {
-            "type": "disk_geo",
-            "cylinders": 1017,
-            "heads": 3,
-            "sectors": 51,
-            "size": 0,
-            "geo_type": "logical"
-          },
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 155648,
-            "value_2": 512
-          }
-        ],
-        "driver": "sd",
-        "driver_module": "sd_mod",
-        "drivers": [
-          "sd"
-        ],
-        "driver_modules": [
-          "sd_mod"
-        ]
-      },
-      {
-        "index": 36,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 9,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Disk",
-          "value": 0
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "VIRTUAL-DISK",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "serial": "beaf71",
-        "model": "IET VIRTUAL-DISK",
-        "sysfs_id": "/class/block/sdi",
-        "sysfs_bus_id": "9:0:0:1",
-        "sysfs_device_link": "/devices/platform/host9/session153/target9:0:0/9:0:0:1",
-        "unix_device_name": "/dev/sdi",
-        "unix_device_number": {
-          "type": 98,
-          "major": 8,
-          "minor": 128,
-          "range": 16
-        },
-        "unix_device_names": [
-          "/dev/disk/by-diskseq/166",
-          "/dev/disk/by-id/scsi-360000000000000000e00000000070001",
-          "/dev/disk/by-id/wwn-0x60000000000000000e00000000070001",
-          "/dev/disk/by-path/ip-10.42.2.244:3260-iscsi-iqn.2019-10.io.longhorn:paperless-redisdata-lun-1",
-          "/dev/disk/by-uuid/0f49df82-6a76-453d-bdaf-0a9332d204b8",
-          "/dev/sdi"
-        ],
-        "unix_device_name2": "/dev/sg20",
-        "unix_device_number2": {
-          "type": 99,
-          "major": 21,
-          "minor": 20,
-          "range": 1
-        },
-        "resources": [
-          {
-            "type": "disk_geo",
-            "cylinders": 1024,
-            "heads": 1,
-            "sectors": 40,
-            "size": 0,
-            "geo_type": "logical"
-          },
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 40960,
-            "value_2": 512
-          }
-        ],
-        "driver": "sd",
-        "driver_module": "sd_mod",
-        "drivers": [
-          "sd"
-        ],
-        "driver_modules": [
-          "sd_mod"
-        ]
-      },
-      {
-        "index": 37,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 17,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Disk",
-          "value": 0
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "VIRTUAL-DISK",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "serial": "beaf131",
-        "model": "IET VIRTUAL-DISK",
-        "sysfs_id": "/class/block/sdq",
-        "sysfs_bus_id": "17:0:0:1",
-        "sysfs_device_link": "/devices/platform/host17/session157/target17:0:0/17:0:0:1",
-        "unix_device_name": "/dev/sdq",
-        "unix_device_number": {
-          "type": 98,
-          "major": 65,
-          "minor": 0,
-          "range": 16
-        },
-        "unix_device_names": [
-          "/dev/disk/by-diskseq/170",
-          "/dev/disk/by-id/scsi-360000000000000000e000000000d0001",
-          "/dev/disk/by-id/wwn-0x60000000000000000e000000000d0001",
-          "/dev/disk/by-path/ip-10.42.2.244:3260-iscsi-iqn.2019-10.io.longhorn:bazarr-lun-1",
-          "/dev/disk/by-uuid/358898d4-e920-414a-b1c8-3e2a6af401ab",
-          "/dev/sdq"
-        ],
-        "unix_device_name2": "/dev/sg26",
-        "unix_device_number2": {
-          "type": 99,
-          "major": 21,
-          "minor": 26,
-          "range": 1
-        },
-        "resources": [
-          {
-            "type": "disk_geo",
-            "cylinders": 1024,
-            "heads": 1,
-            "sectors": 52,
-            "size": 0,
-            "geo_type": "logical"
-          },
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 53248,
-            "value_2": 512
-          }
-        ],
-        "driver": "sd",
-        "driver_module": "sd_mod",
-        "drivers": [
-          "sd"
-        ],
-        "driver_modules": [
-          "sd_mod"
-        ]
-      },
-      {
-        "index": 38,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 7,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Disk",
-          "value": 0
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "VIRTUAL-DISK",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "serial": "beaf51",
-        "model": "IET VIRTUAL-DISK",
-        "sysfs_id": "/class/block/sdg",
-        "sysfs_bus_id": "7:0:0:1",
-        "sysfs_device_link": "/devices/platform/host7/session151/target7:0:0/7:0:0:1",
-        "unix_device_name": "/dev/sdg",
-        "unix_device_number": {
-          "type": 98,
-          "major": 8,
-          "minor": 96,
-          "range": 16
-        },
-        "unix_device_names": [
-          "/dev/disk/by-diskseq/164",
-          "/dev/disk/by-id/scsi-360000000000000000e00000000050001",
-          "/dev/disk/by-id/wwn-0x60000000000000000e00000000050001",
-          "/dev/disk/by-path/ip-10.42.2.244:3260-iscsi-iqn.2019-10.io.longhorn:deluge-lun-1",
-          "/dev/disk/by-uuid/84cc595f-a85d-4aea-a9b6-b2f2ac5e402e",
-          "/dev/sdg"
-        ],
-        "unix_device_name2": "/dev/sg18",
-        "unix_device_number2": {
-          "type": 99,
-          "major": 21,
-          "minor": 18,
-          "range": 1
-        },
-        "resources": [
-          {
-            "type": "disk_geo",
-            "cylinders": 1020,
-            "heads": 17,
-            "sectors": 59,
-            "size": 0,
-            "geo_type": "logical"
-          },
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 1024000,
-            "value_2": 512
-          }
-        ],
-        "driver": "sd",
-        "driver_module": "sd_mod",
-        "drivers": [
-          "sd"
-        ],
-        "driver_modules": [
-          "sd_mod"
-        ]
-      },
-      {
-        "index": 39,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 24,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Disk",
-          "value": 0
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "VIRTUAL-DISK",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "serial": "beaf221",
-        "model": "IET VIRTUAL-DISK",
-        "sysfs_id": "/class/block/sdx",
-        "sysfs_bus_id": "24:0:0:1",
-        "sysfs_device_link": "/devices/platform/host24/session162/target24:0:0/24:0:0:1",
-        "unix_device_name": "/dev/sdx",
-        "unix_device_number": {
-          "type": 98,
-          "major": 65,
-          "minor": 112,
-          "range": 16
-        },
-        "unix_device_names": [
-          "/dev/disk/by-diskseq/175",
-          "/dev/disk/by-id/scsi-360000000000000000e00000000160001",
-          "/dev/disk/by-id/wwn-0x60000000000000000e00000000160001",
-          "/dev/disk/by-path/ip-10.42.2.244:3260-iscsi-iqn.2019-10.io.longhorn:paperless-db-lun-1",
-          "/dev/disk/by-uuid/6a149153-655e-4561-a8c0-c7d19074cce9",
-          "/dev/sdx"
-        ],
-        "unix_device_name2": "/dev/sg34",
-        "unix_device_number2": {
-          "type": 99,
-          "major": 21,
-          "minor": 34,
-          "range": 1
-        },
-        "resources": [
-          {
-            "type": "disk_geo",
-            "cylinders": 1024,
-            "heads": 5,
-            "sectors": 60,
-            "size": 0,
-            "geo_type": "logical"
-          },
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 307200,
-            "value_2": 512
-          }
-        ],
-        "driver": "sd",
-        "driver_module": "sd_mod",
-        "drivers": [
-          "sd"
-        ],
-        "driver_modules": [
-          "sd_mod"
-        ]
-      },
-      {
-        "index": 40,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 5,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Disk",
-          "value": 0
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "VIRTUAL-DISK",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "serial": "beaf31",
-        "model": "IET VIRTUAL-DISK",
-        "sysfs_id": "/class/block/sde",
-        "sysfs_bus_id": "5:0:0:1",
-        "sysfs_device_link": "/devices/platform/host5/session147/target5:0:0/5:0:0:1",
-        "unix_device_name": "/dev/sde",
-        "unix_device_number": {
-          "type": 98,
-          "major": 8,
-          "minor": 64,
-          "range": 16
-        },
-        "unix_device_names": [
-          "/dev/disk/by-diskseq/160",
-          "/dev/disk/by-path/ip-10.42.2.244:3260-iscsi-iqn.2019-10.io.longhorn:pvc-1251134d-6da6-4aae-9b7c-770aa76fffd9-lun-1",
-          "/dev/disk/by-uuid/d0342ab1-820d-4fa8-baf9-d1cfd6441b8e",
-          "/dev/sde"
-        ],
-        "unix_device_name2": "/dev/sg16",
-        "unix_device_number2": {
-          "type": 99,
-          "major": 21,
-          "minor": 16,
-          "range": 1
-        },
-        "resources": [
-          {
-            "type": "disk_geo",
-            "cylinders": 20480,
-            "heads": 64,
-            "sectors": 32,
-            "size": 0,
-            "geo_type": "logical"
-          },
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 41943040,
-            "value_2": 512
-          }
-        ],
-        "driver": "sd",
-        "driver_module": "sd_mod",
-        "drivers": [
-          "sd"
-        ],
-        "driver_modules": [
-          "sd_mod"
-        ]
-      },
-      {
-        "index": 41,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 14,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Disk",
-          "value": 0
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "VIRTUAL-DISK",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "serial": "beaf11",
-        "model": "IET VIRTUAL-DISK",
-        "sysfs_id": "/class/block/sdn",
-        "sysfs_bus_id": "14:0:0:1",
-        "sysfs_device_link": "/devices/platform/host14/session759/target14:0:0/14:0:0:1",
-        "unix_device_name": "/dev/sdn",
-        "unix_device_number": {
-          "type": 98,
-          "major": 8,
-          "minor": 208,
-          "range": 16
-        },
-        "unix_device_names": [
-          "/dev/disk/by-diskseq/790",
-          "/dev/disk/by-path/ip-10.42.2.68:3260-iscsi-iqn.2019-10.io.longhorn:forgejo-lun-1",
-          "/dev/disk/by-uuid/0448fef2-ca9e-4a75-9d21-e148e3e9fe34",
-          "/dev/sdn"
-        ],
-        "unix_device_name2": "/dev/sg46",
-        "unix_device_number2": {
-          "type": 99,
-          "major": 21,
-          "minor": 46,
-          "range": 1
-        },
-        "resources": [
-          {
-            "type": "disk_geo",
-            "cylinders": 20480,
-            "heads": 64,
-            "sectors": 32,
-            "size": 0,
-            "geo_type": "logical"
-          },
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 41943040,
-            "value_2": 512
-          }
-        ],
-        "driver": "sd",
-        "driver_module": "sd_mod",
-        "drivers": [
-          "sd"
-        ],
-        "driver_modules": [
-          "sd_mod"
-        ]
-      },
-      {
-        "index": 42,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 22,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Disk",
-          "value": 0
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "VIRTUAL-DISK",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "serial": "beaf61",
-        "model": "IET VIRTUAL-DISK",
-        "sysfs_id": "/class/block/sdv",
-        "sysfs_bus_id": "22:0:0:1",
-        "sysfs_device_link": "/devices/platform/host22/session587/target22:0:0/22:0:0:1",
-        "unix_device_name": "/dev/sdv",
-        "unix_device_number": {
-          "type": 98,
-          "major": 65,
-          "minor": 80,
-          "range": 16
-        },
-        "unix_device_names": [
-          "/dev/disk/by-diskseq/618",
-          "/dev/disk/by-id/scsi-360000000000000000e00000000060001",
-          "/dev/disk/by-id/wwn-0x60000000000000000e00000000060001",
-          "/dev/disk/by-path/ip-10.42.2.229:3260-iscsi-iqn.2019-10.io.longhorn:sonarr-lun-1",
-          "/dev/disk/by-uuid/b362beb2-a0d6-4fad-97e6-9d234c122aa9",
-          "/dev/sdv"
-        ],
-        "unix_device_name2": "/dev/sg44",
-        "unix_device_number2": {
-          "type": 99,
-          "major": 21,
-          "minor": 44,
-          "range": 1
-        },
-        "resources": [
-          {
-            "type": "disk_geo",
-            "cylinders": 1024,
-            "heads": 5,
-            "sectors": 60,
-            "size": 0,
-            "geo_type": "logical"
-          },
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 307200,
-            "value_2": 512
-          }
-        ],
-        "driver": "sd",
-        "driver_module": "sd_mod",
-        "drivers": [
-          "sd"
-        ],
-        "driver_modules": [
-          "sd_mod"
-        ]
-      },
-      {
-        "index": 43,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 3,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Disk",
-          "value": 0
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "VIRTUAL-DISK",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "serial": "beaf21",
-        "model": "IET VIRTUAL-DISK",
-        "sysfs_id": "/class/block/sdc",
-        "sysfs_bus_id": "3:0:0:1",
-        "sysfs_device_link": "/devices/platform/host3/session146/target3:0:0/3:0:0:1",
-        "unix_device_name": "/dev/sdc",
-        "unix_device_number": {
-          "type": 98,
-          "major": 8,
-          "minor": 32,
-          "range": 16
-        },
-        "unix_device_names": [
-          "/dev/disk/by-diskseq/159",
-          "/dev/disk/by-id/scsi-360000000000000000e00000000020001",
-          "/dev/disk/by-id/wwn-0x60000000000000000e00000000020001",
-          "/dev/disk/by-path/ip-10.42.2.244:3260-iscsi-iqn.2019-10.io.longhorn:jellyfin-lun-1",
-          "/dev/disk/by-uuid/48bef742-1b0e-4417-bfac-3d0d59e4baeb",
-          "/dev/sdc"
-        ],
-        "unix_device_name2": "/dev/sg14",
-        "unix_device_number2": {
-          "type": 99,
-          "major": 21,
-          "minor": 14,
-          "range": 1
-        },
-        "resources": [
-          {
-            "type": "disk_geo",
-            "cylinders": 1018,
-            "heads": 166,
-            "sectors": 62,
-            "size": 0,
-            "geo_type": "logical"
-          },
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 10485760,
-            "value_2": 512
-          }
-        ],
-        "driver": "sd",
-        "driver_module": "sd_mod",
-        "drivers": [
-          "sd"
-        ],
-        "driver_modules": [
-          "sd_mod"
-        ]
-      },
-      {
-        "index": 44,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 12,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Disk",
-          "value": 0
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "VIRTUAL-DISK",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "serial": "beaf111",
-        "model": "IET VIRTUAL-DISK",
-        "sysfs_id": "/class/block/sdl",
-        "sysfs_bus_id": "12:0:0:1",
-        "sysfs_device_link": "/devices/platform/host12/session155/target12:0:0/12:0:0:1",
-        "unix_device_name": "/dev/sdl",
-        "unix_device_number": {
-          "type": 98,
-          "major": 8,
-          "minor": 176,
-          "range": 16
-        },
-        "unix_device_names": [
-          "/dev/disk/by-diskseq/168",
-          "/dev/disk/by-id/scsi-360000000000000000e000000000b0001",
-          "/dev/disk/by-id/wwn-0x60000000000000000e000000000b0001",
-          "/dev/disk/by-path/ip-10.42.2.244:3260-iscsi-iqn.2019-10.io.longhorn:radarr-lun-1",
-          "/dev/disk/by-uuid/ec9d35c0-6ee7-4b3f-8b87-3fc1703c62ce",
-          "/dev/sdl"
-        ],
-        "unix_device_name2": "/dev/sg22",
-        "unix_device_number2": {
-          "type": 99,
-          "major": 21,
-          "minor": 22,
-          "range": 1
-        },
-        "resources": [
-          {
-            "type": "disk_geo",
-            "cylinders": 1024,
-            "heads": 10,
-            "sectors": 60,
-            "size": 0,
-            "geo_type": "logical"
-          },
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 614400,
-            "value_2": 512
-          }
-        ],
-        "driver": "sd",
-        "driver_module": "sd_mod",
-        "drivers": [
-          "sd"
-        ],
-        "driver_modules": [
-          "sd_mod"
-        ]
-      },
-      {
-        "index": 45,
+        "index": 25,
         "attached_to": 18,
+        "class_list": [
+          "disk",
+          "ide",
+          "block_device"
+        ],
         "bus_type": {
+          "hex": "0085",
           "name": "IDE",
           "value": 133
         },
@@ -2344,22 +820,27 @@
           "number": 0
         },
         "base_class": {
+          "hex": "0106",
           "name": "Mass Storage Device",
           "value": 262
         },
         "sub_class": {
+          "hex": "0000",
           "name": "Disk",
           "value": 0
         },
         "vendor": {
+          "hex": "0000",
           "name": "Samsung",
           "value": 0
         },
         "device": {
+          "hex": "0000",
           "name": "SSD 870",
           "value": 0
         },
         "revision": {
+          "hex": "0000",
           "name": "2B6Q",
           "value": 0
         },
@@ -2376,7 +857,6 @@
           "range": 16
         },
         "unix_device_names": [
-          "/dev/disk/by-diskseq/2",
           "/dev/disk/by-id/ata-Samsung_SSD_870_QVO_1TB_S5RRNF0W629236X",
           "/dev/disk/by-id/wwn-0x5002538f43621654",
           "/dev/disk/by-path/pci-0000:00:12.0-ata-1",
@@ -2389,7 +869,7 @@
             "cylinders": 121601,
             "heads": 255,
             "sectors": 63,
-            "size": 0,
+            "size": "0x0",
             "geo_type": "logical"
           },
           {
@@ -2409,259 +889,18 @@
           "ahci",
           "sd_mod"
         ]
-      },
-      {
-        "index": 46,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 10,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Disk",
-          "value": 0
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "VIRTUAL-DISK",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "serial": "beaf41",
-        "model": "IET VIRTUAL-DISK",
-        "sysfs_id": "/class/block/sdj",
-        "sysfs_bus_id": "10:0:0:1",
-        "sysfs_device_link": "/devices/platform/host10/session522/target10:0:0/10:0:0:1",
-        "unix_device_name": "/dev/sdj",
-        "unix_device_number": {
-          "type": 98,
-          "major": 8,
-          "minor": 144,
-          "range": 16
-        },
-        "unix_device_names": [
-          "/dev/disk/by-diskseq/553",
-          "/dev/disk/by-id/scsi-360000000000000000e00000000040001",
-          "/dev/disk/by-id/wwn-0x60000000000000000e00000000040001",
-          "/dev/disk/by-path/ip-10.42.2.229:3260-iscsi-iqn.2019-10.io.longhorn:syncthing-lun-1",
-          "/dev/disk/by-uuid/6cbd7d44-7471-42f0-a325-7fefe1f63960",
-          "/dev/sdj"
-        ],
-        "unix_device_name2": "/dev/sg42",
-        "unix_device_number2": {
-          "type": 99,
-          "major": 21,
-          "minor": 42,
-          "range": 1
-        },
-        "resources": [
-          {
-            "type": "disk_geo",
-            "cylinders": 1016,
-            "heads": 13,
-            "sectors": 62,
-            "size": 0,
-            "geo_type": "logical"
-          },
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 819200,
-            "value_2": 512
-          }
-        ],
-        "driver": "sd",
-        "driver_module": "sd_mod",
-        "drivers": [
-          "sd"
-        ],
-        "driver_modules": [
-          "sd_mod"
-        ]
-      },
-      {
-        "index": 47,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 18,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Disk",
-          "value": 0
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "VIRTUAL-DISK",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "serial": "beaf171",
-        "model": "IET VIRTUAL-DISK",
-        "sysfs_id": "/class/block/sdr",
-        "sysfs_bus_id": "18:0:0:1",
-        "sysfs_device_link": "/devices/platform/host18/session35/target18:0:0/18:0:0:1",
-        "unix_device_name": "/dev/sdr",
-        "unix_device_number": {
-          "type": 98,
-          "major": 65,
-          "minor": 16,
-          "range": 16
-        },
-        "unix_device_names": [
-          "/dev/disk/by-diskseq/48",
-          "/dev/disk/by-id/scsi-360000000000000000e00000000110001",
-          "/dev/disk/by-id/wwn-0x60000000000000000e00000000110001",
-          "/dev/disk/by-path/ip-10.42.2.244:3260-iscsi-iqn.2019-10.io.longhorn:nextcloud-db-lun-1",
-          "/dev/sdr"
-        ],
-        "unix_device_name2": "/dev/sg4",
-        "unix_device_number2": {
-          "type": 99,
-          "major": 21,
-          "minor": 4,
-          "range": 1
-        },
-        "resources": [
-          {
-            "type": "disk_geo",
-            "cylinders": 1016,
-            "heads": 13,
-            "sectors": 62,
-            "size": 0,
-            "geo_type": "logical"
-          },
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 819200,
-            "value_2": 512
-          }
-        ],
-        "driver": "sd",
-        "driver_module": "sd_mod",
-        "drivers": [
-          "sd"
-        ],
-        "driver_modules": [
-          "sd_mod"
-        ]
-      },
-      {
-        "index": 48,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 8,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Disk",
-          "value": 0
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "VIRTUAL-DISK",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "serial": "beaf11",
-        "model": "IET VIRTUAL-DISK",
-        "sysfs_id": "/class/block/sdh",
-        "sysfs_bus_id": "8:0:0:1",
-        "sysfs_device_link": "/devices/platform/host8/session519/target8:0:0/8:0:0:1",
-        "unix_device_name": "/dev/sdh",
-        "unix_device_number": {
-          "type": 98,
-          "major": 8,
-          "minor": 112,
-          "range": 16
-        },
-        "unix_device_names": [
-          "/dev/disk/by-diskseq/550",
-          "/dev/disk/by-path/ip-10.42.2.229:3260-iscsi-iqn.2019-10.io.longhorn:immich-lun-1",
-          "/dev/disk/by-uuid/a274d2e4-c595-48ae-be32-15f7084aedce",
-          "/dev/sdh"
-        ],
-        "unix_device_name2": "/dev/sg38",
-        "unix_device_number2": {
-          "type": 99,
-          "major": 21,
-          "minor": 38,
-          "range": 1
-        },
-        "resources": [
-          {
-            "type": "disk_geo",
-            "cylinders": 51200,
-            "heads": 64,
-            "sectors": 32,
-            "size": 0,
-            "geo_type": "logical"
-          },
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 104857600,
-            "value_2": 512
-          }
-        ],
-        "driver": "sd",
-        "driver_module": "sd_mod",
-        "drivers": [
-          "sd"
-        ],
-        "driver_modules": [
-          "sd_mod"
-        ]
       }
     ],
     "graphics_card": [
       {
         "index": 23,
         "attached_to": 0,
+        "class_list": [
+          "graphics_card",
+          "pci"
+        ],
         "bus_type": {
+          "hex": "0004",
           "name": "PCI",
           "value": 4
         },
@@ -2670,31 +909,39 @@
           "number": 2
         },
         "base_class": {
+          "hex": "0003",
           "name": "Display controller",
           "value": 3
         },
         "sub_class": {
+          "hex": "0000",
           "name": "VGA compatible controller",
           "value": 0
         },
         "pci_interface": {
+          "hex": "0000",
           "name": "VGA",
           "value": 0
         },
         "vendor": {
+          "hex": "8086",
           "name": "Intel Corporation",
           "value": 32902
         },
         "sub_vendor": {
+          "hex": "1458",
           "value": 5208
         },
         "device": {
+          "hex": "3185",
           "value": 12677
         },
         "sub_device": {
+          "hex": "1000",
           "value": 4096
         },
         "revision": {
+          "hex": "0003",
           "value": 3
         },
         "model": "Intel VGA compatible controller",
@@ -2710,7 +957,7 @@
           },
           {
             "type": "irq",
-            "base": 134,
+            "base": 137,
             "triggered": 0,
             "enabled": true
           },
@@ -2744,7 +991,7 @@
           "command": 1031,
           "header_type": 0,
           "secondary_bus": 0,
-          "irq": 134,
+          "irq": 137,
           "prog_if": 0
         },
         "driver": "i915",
@@ -2761,9 +1008,14 @@
     ],
     "hub": [
       {
-        "index": 73,
+        "index": 27,
         "attached_to": 21,
+        "class_list": [
+          "usb",
+          "hub"
+        ],
         "bus_type": {
+          "hex": "0086",
           "name": "USB",
           "value": 134
         },
@@ -2772,23 +1024,27 @@
           "number": 0
         },
         "base_class": {
+          "hex": "010a",
           "name": "Hub",
           "value": 266
         },
         "vendor": {
-          "name": "Linux 6.6.32 xhci-hcd",
+          "hex": "1d6b",
+          "name": "Linux 6.14.8 xhci-hcd",
           "value": 7531
         },
         "device": {
+          "hex": "0002",
           "name": "xHCI Host Controller",
           "value": 2
         },
         "revision": {
-          "name": "6.06",
+          "hex": "0000",
+          "name": "6.14",
           "value": 0
         },
         "serial": "0000:00:15.0",
-        "model": "Linux 6.6.32 xhci-hcd xHCI Host Controller",
+        "model": "Linux 6.14.8 xhci-hcd xHCI Host Controller",
         "sysfs_id": "/devices/pci0000:00/0000:00:15.0/usb1/1-0:1.0",
         "sysfs_bus_id": "1-0:1.0",
         "resources": [
@@ -2803,19 +1059,23 @@
         ],
         "detail": {
           "device_class": {
+            "hex": "0009",
             "name": "hub",
             "value": 9
           },
           "device_subclass": {
+            "hex": "0000",
             "name": "per_interface",
             "value": 0
           },
           "device_protocol": 1,
           "interface_class": {
+            "hex": "0009",
             "name": "hub",
             "value": 9
           },
           "interface_subclass": {
+            "hex": "0000",
             "name": "per_interface",
             "value": 0
           },
@@ -2825,15 +1085,24 @@
         },
         "hotplug": "usb",
         "driver": "hub",
+        "driver_module": "usbcore",
         "drivers": [
           "hub"
         ],
-        "module_alias": "usb:v1D6Bp0002d0606dc09dsc00dp01ic09isc00ip00in00"
+        "driver_modules": [
+          "usbcore"
+        ],
+        "module_alias": "usb:v1D6Bp0002d0614dc09dsc00dp01ic09isc00ip00in00"
       },
       {
-        "index": 75,
+        "index": 29,
         "attached_to": 21,
+        "class_list": [
+          "usb",
+          "hub"
+        ],
         "bus_type": {
+          "hex": "0086",
           "name": "USB",
           "value": 134
         },
@@ -2842,40 +1111,48 @@
           "number": 0
         },
         "base_class": {
+          "hex": "010a",
           "name": "Hub",
           "value": 266
         },
         "vendor": {
-          "name": "Linux 6.6.32 xhci-hcd",
+          "hex": "1d6b",
+          "name": "Linux 6.14.8 xhci-hcd",
           "value": 7531
         },
         "device": {
+          "hex": "0003",
           "name": "xHCI Host Controller",
           "value": 3
         },
         "revision": {
-          "name": "6.06",
+          "hex": "0000",
+          "name": "6.14",
           "value": 0
         },
         "serial": "0000:00:15.0",
-        "model": "Linux 6.6.32 xhci-hcd xHCI Host Controller",
+        "model": "Linux 6.14.8 xhci-hcd xHCI Host Controller",
         "sysfs_id": "/devices/pci0000:00/0000:00:15.0/usb2/2-0:1.0",
         "sysfs_bus_id": "2-0:1.0",
         "detail": {
           "device_class": {
+            "hex": "0009",
             "name": "hub",
             "value": 9
           },
           "device_subclass": {
+            "hex": "0000",
             "name": "per_interface",
             "value": 0
           },
           "device_protocol": 3,
           "interface_class": {
+            "hex": "0009",
             "name": "hub",
             "value": 9
           },
           "interface_subclass": {
+            "hex": "0000",
             "name": "per_interface",
             "value": 0
           },
@@ -2885,21 +1162,30 @@
         },
         "hotplug": "usb",
         "driver": "hub",
+        "driver_module": "usbcore",
         "drivers": [
           "hub"
         ],
-        "module_alias": "usb:v1D6Bp0003d0606dc09dsc00dp03ic09isc00ip00in00"
+        "driver_modules": [
+          "usbcore"
+        ],
+        "module_alias": "usb:v1D6Bp0003d0614dc09dsc00dp03ic09isc00ip00in00"
       }
     ],
     "memory": [
       {
         "index": 7,
         "attached_to": 0,
+        "class_list": [
+          "memory"
+        ],
         "base_class": {
+          "hex": "0101",
           "name": "Internally Used Class",
           "value": 257
         },
         "sub_class": {
+          "hex": "0002",
           "name": "Main Memory",
           "value": 2
         },
@@ -2908,7 +1194,7 @@
           {
             "type": "mem",
             "base": 0,
-            "range": 25008177152,
+            "range": 25003442176,
             "enabled": true,
             "access": "read_write",
             "prefetch": "unknown"
@@ -2924,7 +1210,12 @@
       {
         "index": 8,
         "attached_to": 20,
+        "class_list": [
+          "network_controller",
+          "pci"
+        ],
         "bus_type": {
+          "hex": "0004",
           "name": "PCI",
           "value": 4
         },
@@ -2933,26 +1224,33 @@
           "number": 0
         },
         "base_class": {
+          "hex": "0002",
           "name": "Network controller",
           "value": 2
         },
         "sub_class": {
+          "hex": "0000",
           "name": "Ethernet controller",
           "value": 0
         },
         "vendor": {
+          "hex": "10ec",
           "value": 4332
         },
         "sub_vendor": {
+          "hex": "1458",
           "value": 5208
         },
         "device": {
+          "hex": "8168",
           "value": 33128
         },
         "sub_device": {
+          "hex": "e000",
           "value": 57344
         },
         "revision": {
+          "hex": "0015",
           "value": 21
         },
         "model": "Ethernet controller",
@@ -3022,7 +1320,13 @@
       {
         "index": 12,
         "attached_to": 11,
+        "class_list": [
+          "network_controller",
+          "pci",
+          "wlan_card"
+        ],
         "bus_type": {
+          "hex": "0004",
           "name": "PCI",
           "value": 4
         },
@@ -3031,37 +1335,52 @@
           "number": 0
         },
         "base_class": {
+          "hex": "0002",
           "name": "Network controller",
           "value": 2
         },
         "sub_class": {
-          "name": "Network controller",
-          "value": 128
+          "hex": "0082",
+          "name": "WLAN controller",
+          "value": 130
         },
         "vendor": {
+          "hex": "8086",
           "name": "Intel Corporation",
           "value": 32902
         },
         "sub_vendor": {
+          "hex": "8086",
           "name": "Intel Corporation",
           "value": 32902
         },
         "device": {
+          "hex": "24fb",
           "value": 9467
         },
         "sub_device": {
+          "hex": "2110",
           "value": 8464
         },
         "revision": {
+          "hex": "0010",
           "value": 16
         },
-        "model": "Intel Network controller",
+        "model": "Intel WLAN controller",
         "sysfs_id": "/devices/pci0000:00/0000:00:13.2/0000:02:00.0",
         "sysfs_bus_id": "0000:02:00.0",
+        "unix_device_name": "wlo1",
+        "unix_device_names": [
+          "wlo1"
+        ],
         "resources": [
+          {
+            "type": "hwaddr",
+            "address": 102
+          },
           {
             "type": "irq",
-            "base": 20,
+            "base": 135,
             "triggered": 0,
             "enabled": true
           },
@@ -3072,29 +1391,194 @@
             "enabled": true,
             "access": "read_write",
             "prefetch": "no"
+          },
+          {
+            "type": "phwaddr",
+            "address": 102
+          },
+          {
+            "type": "wlan",
+            "channels": [
+              "1",
+              "2",
+              "3",
+              "4",
+              "5",
+              "6",
+              "7",
+              "8",
+              "9",
+              "10",
+              "11",
+              "12",
+              "13",
+              "14",
+              "36",
+              "40",
+              "44",
+              "48",
+              "52",
+              "56",
+              "60",
+              "64",
+              "100",
+              "104",
+              "108",
+              "112",
+              "116",
+              "120",
+              "124",
+              "128",
+              "132",
+              "136"
+            ],
+            "frequencies": [
+              "2.412",
+              "2.417",
+              "2.422",
+              "2.427",
+              "2.432",
+              "2.437",
+              "2.442",
+              "2.447",
+              "2.452",
+              "2.457",
+              "2.462",
+              "2.467",
+              "2.472",
+              "2.484",
+              "5.18",
+              "5.2",
+              "5.22",
+              "5.24",
+              "5.26",
+              "5.28",
+              "5.3",
+              "5.32",
+              "5.5",
+              "5.52",
+              "5.54",
+              "5.56",
+              "5.58",
+              "5.6",
+              "5.62",
+              "5.64",
+              "5.66",
+              "5.68"
+            ],
+            "auth_modes": [
+              "open",
+              "sharedkey",
+              "wpa-psk",
+              "wpa-eap"
+            ],
+            "enc_modes": [
+              "WEP40",
+              "WEP104",
+              "TKIP",
+              "CCMP"
+            ]
           }
         ],
         "detail": {
           "function": 0,
-          "command": 2,
+          "command": 1030,
           "header_type": 0,
           "secondary_bus": 0,
-          "irq": 20,
+          "irq": 135,
           "prog_if": 0
         },
+        "driver": "iwlwifi",
+        "driver_module": "iwlwifi",
+        "drivers": [
+          "iwlwifi"
+        ],
+        "driver_modules": [
+          "iwlwifi"
+        ],
         "module_alias": "pci:v00008086d000024FBsv00008086sd00002110bc02sc80i00",
         "label": "Onboard - RTK Ethernet"
       }
     ],
     "network_interface": [
       {
-        "index": 91,
-        "attached_to": 8,
+        "index": 38,
+        "attached_to": 0,
+        "class_list": [
+          "network_interface"
+        ],
         "base_class": {
+          "hex": "0107",
           "name": "Network Interface",
           "value": 263
         },
         "sub_class": {
+          "hex": "0000",
+          "name": "Loopback",
+          "value": 0
+        },
+        "model": "Loopback network interface",
+        "sysfs_id": "/class/net/lo",
+        "unix_device_name": "lo",
+        "unix_device_names": [
+          "lo"
+        ]
+      },
+      {
+        "index": 44,
+        "attached_to": 12,
+        "class_list": [
+          "network_interface"
+        ],
+        "base_class": {
+          "hex": "0107",
+          "name": "Network Interface",
+          "value": 263
+        },
+        "sub_class": {
+          "hex": "0001",
+          "name": "Ethernet",
+          "value": 1
+        },
+        "model": "Ethernet network interface",
+        "sysfs_id": "/class/net/wlo1",
+        "sysfs_device_link": "/devices/pci0000:00/0000:00:13.2/0000:02:00.0",
+        "unix_device_name": "wlo1",
+        "unix_device_names": [
+          "wlo1"
+        ],
+        "resources": [
+          {
+            "type": "hwaddr",
+            "address": 102
+          },
+          {
+            "type": "phwaddr",
+            "address": 102
+          }
+        ],
+        "driver": "iwlwifi",
+        "driver_module": "iwlwifi",
+        "drivers": [
+          "iwlwifi"
+        ],
+        "driver_modules": [
+          "iwlwifi"
+        ]
+      },
+      {
+        "index": 45,
+        "attached_to": 8,
+        "class_list": [
+          "network_interface"
+        ],
+        "base_class": {
+          "hex": "0107",
+          "name": "Network Interface",
+          "value": 263
+        },
+        "sub_class": {
+          "hex": "0001",
           "name": "Ethernet",
           "value": 1
         },
@@ -3123,221 +1607,18 @@
         "driver_modules": [
           "r8169"
         ]
-      },
-      {
-        "index": 100,
-        "attached_to": 0,
-        "base_class": {
-          "name": "Network Interface",
-          "value": 263
-        },
-        "sub_class": {
-          "name": "Loopback",
-          "value": 0
-        },
-        "model": "Loopback network interface",
-        "sysfs_id": "/class/net/lo",
-        "unix_device_name": "lo",
-        "unix_device_names": [
-          "lo"
-        ]
       }
     ],
-    "storage_controller": [
-      {
-        "index": 14,
-        "attached_to": 13,
-        "bus_type": {
-          "name": "PCI",
-          "value": 4
-        },
-        "slot": {
-          "bus": 1,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass storage controller",
-          "value": 1
-        },
-        "sub_class": {
-          "value": 8
-        },
-        "pci_interface": {
-          "value": 2
-        },
-        "vendor": {
-          "value": 9798
-        },
-        "sub_vendor": {
-          "value": 9798
-        },
-        "device": {
-          "value": 20503
-        },
-        "sub_device": {
-          "value": 20503
-        },
-        "revision": {
-          "value": 3
-        },
-        "model": "Mass storage controller",
-        "sysfs_id": "/devices/pci0000:00/0000:00:13.0/0000:01:00.0",
-        "sysfs_bus_id": "0000:01:00.0",
-        "resources": [
-          {
-            "type": "irq",
-            "base": 22,
-            "triggered": 0,
-            "enabled": true
-          },
-          {
-            "type": "mem",
-            "base": 2703228928,
-            "range": 16384,
-            "enabled": true,
-            "access": "read_write",
-            "prefetch": "no"
-          }
-        ],
-        "detail": {
-          "function": 0,
-          "command": 1030,
-          "header_type": 0,
-          "secondary_bus": 0,
-          "irq": 22,
-          "prog_if": 2
-        },
-        "driver": "nvme",
-        "driver_module": "nvme",
-        "drivers": [
-          "nvme"
-        ],
-        "driver_modules": [
-          "nvme"
-        ],
-        "module_alias": "pci:v00002646d00005017sv00002646sd00005017bc01sc08i02"
-      },
-      {
-        "index": 18,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "PCI",
-          "value": 4
-        },
-        "slot": {
-          "bus": 0,
-          "number": 18
-        },
-        "base_class": {
-          "name": "Mass storage controller",
-          "value": 1
-        },
-        "sub_class": {
-          "value": 6
-        },
-        "pci_interface": {
-          "value": 1
-        },
-        "vendor": {
-          "name": "Intel Corporation",
-          "value": 32902
-        },
-        "sub_vendor": {
-          "value": 5208
-        },
-        "device": {
-          "value": 12771
-        },
-        "sub_device": {
-          "value": 4096
-        },
-        "revision": {
-          "value": 3
-        },
-        "model": "Intel Mass storage controller",
-        "sysfs_id": "/devices/pci0000:00/0000:00:12.0",
-        "sysfs_bus_id": "0000:00:12.0",
-        "resources": [
-          {
-            "type": "io",
-            "base": 61536,
-            "range": 32,
-            "enabled": true,
-            "access": "read_write"
-          },
-          {
-            "type": "io",
-            "base": 61568,
-            "range": 4,
-            "enabled": true,
-            "access": "read_write"
-          },
-          {
-            "type": "io",
-            "base": 61584,
-            "range": 8,
-            "enabled": true,
-            "access": "read_write"
-          },
-          {
-            "type": "irq",
-            "base": 131,
-            "triggered": 0,
-            "enabled": true
-          },
-          {
-            "type": "mem",
-            "base": 2704343040,
-            "range": 8192,
-            "enabled": true,
-            "access": "read_write",
-            "prefetch": "no"
-          },
-          {
-            "type": "mem",
-            "base": 2704371712,
-            "range": 2048,
-            "enabled": true,
-            "access": "read_write",
-            "prefetch": "no"
-          },
-          {
-            "type": "mem",
-            "base": 2704375808,
-            "range": 256,
-            "enabled": true,
-            "access": "read_write",
-            "prefetch": "no"
-          }
-        ],
-        "detail": {
-          "function": 0,
-          "command": 1031,
-          "header_type": 0,
-          "secondary_bus": 0,
-          "irq": 131,
-          "prog_if": 1
-        },
-        "driver": "ahci",
-        "driver_module": "ahci",
-        "drivers": [
-          "ahci"
-        ],
-        "driver_modules": [
-          "ahci"
-        ],
-        "module_alias": "pci:v00008086d000031E3sv00001458sd00001000bc01sc06i01",
-        "label": "Onboard - SATA"
-      }
-    ],
-    "system": {
-      "form_factor": "desktop"
-    },
-    "unknown": [
+    "pci": [
       {
         "index": 9,
         "attached_to": 0,
+        "class_list": [
+          "pci",
+          "unknown"
+        ],
         "bus_type": {
+          "hex": "0004",
           "name": "PCI",
           "value": 4
         },
@@ -3346,29 +1627,37 @@
           "number": 28
         },
         "base_class": {
+          "hex": "0008",
           "name": "Generic system peripheral",
           "value": 8
         },
         "sub_class": {
+          "hex": "0005",
           "value": 5
         },
         "pci_interface": {
+          "hex": "0001",
           "value": 1
         },
         "vendor": {
+          "hex": "8086",
           "name": "Intel Corporation",
           "value": 32902
         },
         "sub_vendor": {
+          "hex": "1458",
           "value": 5208
         },
         "device": {
+          "hex": "31cc",
           "value": 12748
         },
         "sub_device": {
+          "hex": "1000",
           "value": 4096
         },
         "revision": {
+          "hex": "0003",
           "value": 3
         },
         "model": "Intel Generic system peripheral",
@@ -3420,7 +1709,12 @@
       {
         "index": 15,
         "attached_to": 0,
+        "class_list": [
+          "pci",
+          "unknown"
+        ],
         "bus_type": {
+          "hex": "0004",
           "name": "PCI",
           "value": 4
         },
@@ -3429,29 +1723,37 @@
           "number": 30
         },
         "base_class": {
+          "hex": "0008",
           "name": "Generic system peripheral",
           "value": 8
         },
         "sub_class": {
+          "hex": "0005",
           "value": 5
         },
         "pci_interface": {
+          "hex": "0001",
           "value": 1
         },
         "vendor": {
+          "hex": "8086",
           "name": "Intel Corporation",
           "value": 32902
         },
         "sub_vendor": {
+          "hex": "1458",
           "value": 5208
         },
         "device": {
+          "hex": "31d0",
           "value": 12752
         },
         "sub_device": {
+          "hex": "1000",
           "value": 4096
         },
         "revision": {
+          "hex": "0003",
           "value": 3
         },
         "model": "Intel Generic system peripheral",
@@ -3503,7 +1805,12 @@
       {
         "index": 16,
         "attached_to": 0,
+        "class_list": [
+          "pci",
+          "unknown"
+        ],
         "bus_type": {
+          "hex": "0004",
           "name": "PCI",
           "value": 4
         },
@@ -3512,27 +1819,34 @@
           "number": 15
         },
         "base_class": {
+          "hex": "0007",
           "name": "Communication controller",
           "value": 7
         },
         "sub_class": {
+          "hex": "0080",
           "name": "Communication controller",
           "value": 128
         },
         "vendor": {
+          "hex": "8086",
           "name": "Intel Corporation",
           "value": 32902
         },
         "sub_vendor": {
+          "hex": "1458",
           "value": 5208
         },
         "device": {
+          "hex": "319a",
           "value": 12698
         },
         "sub_device": {
+          "hex": "1000",
           "value": 4096
         },
         "revision": {
+          "hex": "0003",
           "value": 3
         },
         "model": "Intel Communication controller",
@@ -3541,7 +1855,7 @@
         "resources": [
           {
             "type": "irq",
-            "base": 132,
+            "base": 134,
             "triggered": 0,
             "enabled": true
           },
@@ -3559,7 +1873,7 @@
           "command": 1030,
           "header_type": 0,
           "secondary_bus": 0,
-          "irq": 132,
+          "irq": 134,
           "prog_if": 0
         },
         "driver": "mei_me",
@@ -3576,7 +1890,12 @@
       {
         "index": 19,
         "attached_to": 0,
+        "class_list": [
+          "pci",
+          "unknown"
+        ],
         "bus_type": {
+          "hex": "0004",
           "name": "PCI",
           "value": 4
         },
@@ -3585,27 +1904,34 @@
           "number": 31
         },
         "base_class": {
+          "hex": "000c",
           "name": "Serial bus controller",
           "value": 12
         },
         "sub_class": {
+          "hex": "0005",
           "name": "SMBus",
           "value": 5
         },
         "vendor": {
+          "hex": "8086",
           "name": "Intel Corporation",
           "value": 32902
         },
         "sub_vendor": {
+          "hex": "1458",
           "value": 5208
         },
         "device": {
+          "hex": "31d4",
           "value": 12756
         },
         "sub_device": {
+          "hex": "1000",
           "value": 4096
         },
         "revision": {
+          "hex": "0003",
           "value": 3
         },
         "model": "Intel SMBus",
@@ -3656,7 +1982,12 @@
       {
         "index": 22,
         "attached_to": 0,
+        "class_list": [
+          "pci",
+          "unknown"
+        ],
         "bus_type": {
+          "hex": "0004",
           "name": "PCI",
           "value": 4
         },
@@ -3665,27 +1996,34 @@
           "number": 0
         },
         "base_class": {
+          "hex": "0008",
           "name": "Generic system peripheral",
           "value": 8
         },
         "sub_class": {
+          "hex": "0080",
           "name": "System peripheral",
           "value": 128
         },
         "vendor": {
+          "hex": "8086",
           "name": "Intel Corporation",
           "value": 32902
         },
         "sub_vendor": {
+          "hex": "1458",
           "value": 5208
         },
         "device": {
+          "hex": "3190",
           "value": 12688
         },
         "sub_device": {
+          "hex": "1000",
           "value": 4096
         },
         "revision": {
+          "hex": "0003",
           "value": 3
         },
         "model": "Intel System peripheral",
@@ -3717,1048 +2055,234 @@
         },
         "module_alias": "pci:v00008086d00003190sv00001458sd00001000bc08sc80i00",
         "label": "Onboard - Other"
-      },
-      {
-        "index": 49,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 6,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Storage Device",
-          "value": 128
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "Controller",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "model": "IET Controller",
-        "sysfs_id": "/class/scsi_generic/sg39",
-        "sysfs_bus_id": "6:0:0:0",
-        "unix_device_name": "/dev/sg39",
-        "unix_device_number": {
-          "type": 99,
-          "major": 21,
-          "minor": 39,
-          "range": 1
-        },
-        "unix_device_names": [
-          "/dev/sg39"
-        ]
-      },
-      {
-        "index": 50,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 21,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Storage Device",
-          "value": 128
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "Controller",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "model": "IET Controller",
-        "sysfs_id": "/class/scsi_generic/sg29",
-        "sysfs_bus_id": "21:0:0:0",
-        "unix_device_name": "/dev/sg29",
-        "unix_device_number": {
-          "type": 99,
-          "major": 21,
-          "minor": 29,
-          "range": 1
-        },
-        "unix_device_names": [
-          "/dev/sg29"
-        ]
-      },
-      {
-        "index": 51,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 28,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Storage Device",
-          "value": 128
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "Controller",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "model": "IET Controller",
-        "sysfs_id": "/class/scsi_generic/sg9",
-        "sysfs_bus_id": "28:0:0:0",
-        "unix_device_name": "/dev/sg9",
-        "unix_device_number": {
-          "type": 99,
-          "major": 21,
-          "minor": 9,
-          "range": 1
-        },
-        "unix_device_names": [
-          "/dev/sg9"
-        ]
-      },
-      {
-        "index": 52,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 9,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Storage Device",
-          "value": 128
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "Controller",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "model": "IET Controller",
-        "sysfs_id": "/class/scsi_generic/sg19",
-        "sysfs_bus_id": "9:0:0:0",
-        "unix_device_name": "/dev/sg19",
-        "unix_device_number": {
-          "type": 99,
-          "major": 21,
-          "minor": 19,
-          "range": 1
-        },
-        "unix_device_names": [
-          "/dev/sg19"
-        ]
-      },
-      {
-        "index": 53,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 8,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Storage Device",
-          "value": 128
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "Controller",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "model": "IET Controller",
-        "sysfs_id": "/class/scsi_generic/sg37",
-        "sysfs_bus_id": "8:0:0:0",
-        "unix_device_name": "/dev/sg37",
-        "unix_device_number": {
-          "type": 99,
-          "major": 21,
-          "minor": 37,
-          "range": 1
-        },
-        "unix_device_names": [
-          "/dev/sg37"
-        ]
-      },
-      {
-        "index": 54,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 19,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Storage Device",
-          "value": 128
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "Controller",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "model": "IET Controller",
-        "sysfs_id": "/class/scsi_generic/sg27",
-        "sysfs_bus_id": "19:0:0:0",
-        "unix_device_name": "/dev/sg27",
-        "unix_device_number": {
-          "type": 99,
-          "major": 21,
-          "minor": 27,
-          "range": 1
-        },
-        "unix_device_names": [
-          "/dev/sg27"
-        ]
-      },
-      {
-        "index": 55,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 11,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Storage Device",
-          "value": 128
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "Controller",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "model": "IET Controller",
-        "sysfs_id": "/class/scsi_generic/sg7",
-        "sysfs_bus_id": "11:0:0:0",
-        "unix_device_name": "/dev/sg7",
-        "unix_device_number": {
-          "type": 99,
-          "major": 21,
-          "minor": 7,
-          "range": 1
-        },
-        "unix_device_names": [
-          "/dev/sg7"
-        ]
-      },
-      {
-        "index": 56,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 7,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Storage Device",
-          "value": 128
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "Controller",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "model": "IET Controller",
-        "sysfs_id": "/class/scsi_generic/sg17",
-        "sysfs_bus_id": "7:0:0:0",
-        "unix_device_name": "/dev/sg17",
-        "unix_device_number": {
-          "type": 99,
-          "major": 21,
-          "minor": 17,
-          "range": 1
-        },
-        "unix_device_names": [
-          "/dev/sg17"
-        ]
-      },
-      {
-        "index": 57,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 14,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Storage Device",
-          "value": 128
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "Controller",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "model": "IET Controller",
-        "sysfs_id": "/class/scsi_generic/sg45",
-        "sysfs_bus_id": "14:0:0:0",
-        "unix_device_name": "/dev/sg45",
-        "unix_device_number": {
-          "type": 99,
-          "major": 21,
-          "minor": 45,
-          "range": 1
-        },
-        "unix_device_names": [
-          "/dev/sg45"
-        ]
-      },
-      {
-        "index": 58,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 25,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Storage Device",
-          "value": 128
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "Controller",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "model": "IET Controller",
-        "sysfs_id": "/class/scsi_generic/sg35",
-        "sysfs_bus_id": "25:0:0:0",
-        "unix_device_name": "/dev/sg35",
-        "unix_device_number": {
-          "type": 99,
-          "major": 21,
-          "minor": 35,
-          "range": 1
-        },
-        "unix_device_names": [
-          "/dev/sg35"
-        ]
-      },
-      {
-        "index": 59,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 17,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Storage Device",
-          "value": 128
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "Controller",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "model": "IET Controller",
-        "sysfs_id": "/class/scsi_generic/sg25",
-        "sysfs_bus_id": "17:0:0:0",
-        "unix_device_name": "/dev/sg25",
-        "unix_device_number": {
-          "type": 99,
-          "major": 21,
-          "minor": 25,
-          "range": 1
-        },
-        "unix_device_names": [
-          "/dev/sg25"
-        ]
-      },
-      {
-        "index": 60,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 4,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Storage Device",
-          "value": 128
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "Controller",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "model": "IET Controller",
-        "sysfs_id": "/class/scsi_generic/sg5",
-        "sysfs_bus_id": "4:0:0:0",
-        "unix_device_name": "/dev/sg5",
-        "unix_device_number": {
-          "type": 99,
-          "major": 21,
-          "minor": 5,
-          "range": 1
-        },
-        "unix_device_names": [
-          "/dev/sg5"
-        ]
-      },
-      {
-        "index": 61,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 5,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Storage Device",
-          "value": 128
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "Controller",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "model": "IET Controller",
-        "sysfs_id": "/class/scsi_generic/sg15",
-        "sysfs_bus_id": "5:0:0:0",
-        "unix_device_name": "/dev/sg15",
-        "unix_device_number": {
-          "type": 99,
-          "major": 21,
-          "minor": 15,
-          "range": 1
-        },
-        "unix_device_names": [
-          "/dev/sg15"
-        ]
-      },
-      {
-        "index": 62,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 22,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Storage Device",
-          "value": 128
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "Controller",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "model": "IET Controller",
-        "sysfs_id": "/class/scsi_generic/sg43",
-        "sysfs_bus_id": "22:0:0:0",
-        "unix_device_name": "/dev/sg43",
-        "unix_device_number": {
-          "type": 99,
-          "major": 21,
-          "minor": 43,
-          "range": 1
-        },
-        "unix_device_names": [
-          "/dev/sg43"
-        ]
-      },
-      {
-        "index": 63,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 24,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Storage Device",
-          "value": 128
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "Controller",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "model": "IET Controller",
-        "sysfs_id": "/class/scsi_generic/sg33",
-        "sysfs_bus_id": "24:0:0:0",
-        "unix_device_name": "/dev/sg33",
-        "unix_device_number": {
-          "type": 99,
-          "major": 21,
-          "minor": 33,
-          "range": 1
-        },
-        "unix_device_names": [
-          "/dev/sg33"
-        ]
-      },
-      {
-        "index": 64,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 13,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Storage Device",
-          "value": 128
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "Controller",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "model": "IET Controller",
-        "sysfs_id": "/class/scsi_generic/sg23",
-        "sysfs_bus_id": "13:0:0:0",
-        "unix_device_name": "/dev/sg23",
-        "unix_device_number": {
-          "type": 99,
-          "major": 21,
-          "minor": 23,
-          "range": 1
-        },
-        "unix_device_names": [
-          "/dev/sg23"
-        ]
-      },
-      {
-        "index": 65,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 18,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Storage Device",
-          "value": 128
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "Controller",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "model": "IET Controller",
-        "sysfs_id": "/class/scsi_generic/sg3",
-        "sysfs_bus_id": "18:0:0:0",
-        "unix_device_name": "/dev/sg3",
-        "unix_device_number": {
-          "type": 99,
-          "major": 21,
-          "minor": 3,
-          "range": 1
-        },
-        "unix_device_names": [
-          "/dev/sg3"
-        ]
-      },
-      {
-        "index": 66,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 3,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Storage Device",
-          "value": 128
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "Controller",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "model": "IET Controller",
-        "sysfs_id": "/class/scsi_generic/sg13",
-        "sysfs_bus_id": "3:0:0:0",
-        "unix_device_name": "/dev/sg13",
-        "unix_device_number": {
-          "type": 99,
-          "major": 21,
-          "minor": 13,
-          "range": 1
-        },
-        "unix_device_names": [
-          "/dev/sg13"
-        ]
-      },
-      {
-        "index": 67,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 10,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Storage Device",
-          "value": 128
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "Controller",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "model": "IET Controller",
-        "sysfs_id": "/class/scsi_generic/sg41",
-        "sysfs_bus_id": "10:0:0:0",
-        "unix_device_name": "/dev/sg41",
-        "unix_device_number": {
-          "type": 99,
-          "major": 21,
-          "minor": 41,
-          "range": 1
-        },
-        "unix_device_names": [
-          "/dev/sg41"
-        ]
-      },
-      {
-        "index": 68,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 23,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Storage Device",
-          "value": 128
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "Controller",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "model": "IET Controller",
-        "sysfs_id": "/class/scsi_generic/sg31",
-        "sysfs_bus_id": "23:0:0:0",
-        "unix_device_name": "/dev/sg31",
-        "unix_device_number": {
-          "type": 99,
-          "major": 21,
-          "minor": 31,
-          "range": 1
-        },
-        "unix_device_names": [
-          "/dev/sg31"
-        ]
-      },
-      {
-        "index": 69,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 12,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Storage Device",
-          "value": 128
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "Controller",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "model": "IET Controller",
-        "sysfs_id": "/class/scsi_generic/sg21",
-        "sysfs_bus_id": "12:0:0:0",
-        "unix_device_name": "/dev/sg21",
-        "unix_device_number": {
-          "type": 99,
-          "major": 21,
-          "minor": 21,
-          "range": 1
-        },
-        "unix_device_names": [
-          "/dev/sg21"
-        ]
-      },
-      {
-        "index": 70,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 2,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Storage Device",
-          "value": 128
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "Controller",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "model": "IET Controller",
-        "sysfs_id": "/class/scsi_generic/sg1",
-        "sysfs_bus_id": "2:0:0:0",
-        "unix_device_name": "/dev/sg1",
-        "unix_device_number": {
-          "type": 99,
-          "major": 21,
-          "minor": 1,
-          "range": 1
-        },
-        "unix_device_names": [
-          "/dev/sg1"
-        ]
-      },
-      {
-        "index": 71,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 15,
-          "number": 0
-        },
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Storage Device",
-          "value": 128
-        },
-        "vendor": {
-          "name": "IET",
-          "value": 0
-        },
-        "device": {
-          "name": "Controller",
-          "value": 0
-        },
-        "revision": {
-          "name": "0001",
-          "value": 0
-        },
-        "model": "IET Controller",
-        "sysfs_id": "/class/scsi_generic/sg11",
-        "sysfs_bus_id": "15:0:0:0",
-        "unix_device_name": "/dev/sg11",
-        "unix_device_number": {
-          "type": 99,
-          "major": 21,
-          "minor": 11,
-          "range": 1
-        },
-        "unix_device_names": [
-          "/dev/sg11"
-        ]
       }
     ],
+    "storage_controller": [
+      {
+        "index": 14,
+        "attached_to": 13,
+        "class_list": [
+          "storage_controller",
+          "pci"
+        ],
+        "bus_type": {
+          "hex": "0004",
+          "name": "PCI",
+          "value": 4
+        },
+        "slot": {
+          "bus": 1,
+          "number": 0
+        },
+        "base_class": {
+          "hex": "0001",
+          "name": "Mass storage controller",
+          "value": 1
+        },
+        "sub_class": {
+          "hex": "0008",
+          "value": 8
+        },
+        "pci_interface": {
+          "hex": "0002",
+          "value": 2
+        },
+        "vendor": {
+          "hex": "2646",
+          "value": 9798
+        },
+        "sub_vendor": {
+          "hex": "2646",
+          "value": 9798
+        },
+        "device": {
+          "hex": "5017",
+          "value": 20503
+        },
+        "sub_device": {
+          "hex": "5017",
+          "value": 20503
+        },
+        "revision": {
+          "hex": "0003",
+          "value": 3
+        },
+        "model": "Mass storage controller",
+        "sysfs_id": "/devices/pci0000:00/0000:00:13.0/0000:01:00.0",
+        "sysfs_bus_id": "0000:01:00.0",
+        "resources": [
+          {
+            "type": "irq",
+            "base": 22,
+            "triggered": 0,
+            "enabled": true
+          },
+          {
+            "type": "mem",
+            "base": 2703228928,
+            "range": 16384,
+            "enabled": true,
+            "access": "read_write",
+            "prefetch": "no"
+          }
+        ],
+        "detail": {
+          "function": 0,
+          "command": 1030,
+          "header_type": 0,
+          "secondary_bus": 0,
+          "irq": 22,
+          "prog_if": 2
+        },
+        "driver": "nvme",
+        "driver_module": "nvme",
+        "drivers": [
+          "nvme"
+        ],
+        "driver_modules": [
+          "nvme"
+        ],
+        "module_alias": "pci:v00002646d00005017sv00002646sd00005017bc01sc08i02"
+      },
+      {
+        "index": 18,
+        "attached_to": 0,
+        "class_list": [
+          "storage_controller",
+          "pci"
+        ],
+        "bus_type": {
+          "hex": "0004",
+          "name": "PCI",
+          "value": 4
+        },
+        "slot": {
+          "bus": 0,
+          "number": 18
+        },
+        "base_class": {
+          "hex": "0001",
+          "name": "Mass storage controller",
+          "value": 1
+        },
+        "sub_class": {
+          "hex": "0006",
+          "value": 6
+        },
+        "pci_interface": {
+          "hex": "0001",
+          "value": 1
+        },
+        "vendor": {
+          "hex": "8086",
+          "name": "Intel Corporation",
+          "value": 32902
+        },
+        "sub_vendor": {
+          "hex": "1458",
+          "value": 5208
+        },
+        "device": {
+          "hex": "31e3",
+          "value": 12771
+        },
+        "sub_device": {
+          "hex": "1000",
+          "value": 4096
+        },
+        "revision": {
+          "hex": "0003",
+          "value": 3
+        },
+        "model": "Intel Mass storage controller",
+        "sysfs_id": "/devices/pci0000:00/0000:00:12.0",
+        "sysfs_bus_id": "0000:00:12.0",
+        "resources": [
+          {
+            "type": "io",
+            "base": 61536,
+            "range": 32,
+            "enabled": true,
+            "access": "read_write"
+          },
+          {
+            "type": "io",
+            "base": 61568,
+            "range": 4,
+            "enabled": true,
+            "access": "read_write"
+          },
+          {
+            "type": "io",
+            "base": 61584,
+            "range": 8,
+            "enabled": true,
+            "access": "read_write"
+          },
+          {
+            "type": "irq",
+            "base": 133,
+            "triggered": 0,
+            "enabled": true
+          },
+          {
+            "type": "mem",
+            "base": 2704343040,
+            "range": 8192,
+            "enabled": true,
+            "access": "read_write",
+            "prefetch": "no"
+          },
+          {
+            "type": "mem",
+            "base": 2704371712,
+            "range": 2048,
+            "enabled": true,
+            "access": "read_write",
+            "prefetch": "no"
+          },
+          {
+            "type": "mem",
+            "base": 2704375808,
+            "range": 256,
+            "enabled": true,
+            "access": "read_write",
+            "prefetch": "no"
+          }
+        ],
+        "detail": {
+          "function": 0,
+          "command": 1031,
+          "header_type": 0,
+          "secondary_bus": 0,
+          "irq": 133,
+          "prog_if": 1
+        },
+        "driver": "ahci",
+        "driver_module": "ahci",
+        "drivers": [
+          "ahci"
+        ],
+        "driver_modules": [
+          "ahci"
+        ],
+        "module_alias": "pci:v00008086d000031E3sv00001458sd00001000bc01sc06i01",
+        "label": "Onboard - SATA"
+      }
+    ],
+    "system": {
+      "form_factor": "desktop"
+    },
     "usb_controller": [
       {
         "index": 21,
         "attached_to": 0,
+        "class_list": [
+          "usb_controller",
+          "pci"
+        ],
         "bus_type": {
+          "hex": "0004",
           "name": "PCI",
           "value": 4
         },
@@ -4767,30 +2291,38 @@
           "number": 21
         },
         "base_class": {
+          "hex": "000c",
           "name": "Serial bus controller",
           "value": 12
         },
         "sub_class": {
+          "hex": "0003",
           "name": "USB Controller",
           "value": 3
         },
         "pci_interface": {
+          "hex": "0030",
           "value": 48
         },
         "vendor": {
+          "hex": "8086",
           "name": "Intel Corporation",
           "value": 32902
         },
         "sub_vendor": {
+          "hex": "1458",
           "value": 5208
         },
         "device": {
+          "hex": "31a8",
           "value": 12712
         },
         "sub_device": {
+          "hex": "1000",
           "value": 4096
         },
         "revision": {
+          "hex": "0003",
           "value": 3
         },
         "model": "Intel USB Controller",
@@ -4799,7 +2331,7 @@
         "resources": [
           {
             "type": "irq",
-            "base": 125,
+            "base": 123,
             "triggered": 0,
             "enabled": true
           },
@@ -4817,7 +2349,7 @@
           "command": 1030,
           "header_type": 0,
           "secondary_bus": 0,
-          "irq": 125,
+          "irq": 123,
           "prog_if": 48
         },
         "driver": "xhci_hcd",
@@ -4867,6 +2399,7 @@
       "product": "MZGLKAP-00",
       "version": "1.x",
       "board_type": {
+        "hex": "000a",
         "name": "Motherboard",
         "value": 10
       },
@@ -4885,25 +2418,30 @@
         "size_current": 224,
         "speed": 0,
         "mode": {
+          "hex": "0001",
           "name": "Write Back",
           "value": 1
         },
         "enabled": true,
         "location": {
+          "hex": "0000",
           "name": "Internal",
           "value": 0
         },
         "socketed": false,
         "level": 0,
         "ecc": {
+          "hex": "0004",
           "name": "Parity",
           "value": 4
         },
         "cache_type": {
+          "hex": "0001",
           "name": "Other",
           "value": 1
         },
         "associativity": {
+          "hex": "0001",
           "name": "Other",
           "value": 1
         },
@@ -4921,25 +2459,30 @@
         "size_current": 4096,
         "speed": 0,
         "mode": {
+          "hex": "0001",
           "name": "Write Back",
           "value": 1
         },
         "enabled": true,
         "location": {
+          "hex": "0000",
           "name": "Internal",
           "value": 0
         },
         "socketed": false,
         "level": 1,
         "ecc": {
+          "hex": "0005",
           "name": "Single-bit",
           "value": 5
         },
         "cache_type": {
+          "hex": "0005",
           "name": "Unified",
           "value": 5
         },
         "associativity": {
+          "hex": "0008",
           "name": "16-way Set-Associative",
           "value": 8
         },
@@ -4951,33 +2494,40 @@
         ]
       }
     ],
-    "chassis": {
-      "handle": 3,
-      "manufacturer": "Default string",
-      "version": "Default string",
-      "chassis_type": {
-        "name": "Desktop",
-        "value": 3
-      },
-      "lock_present": false,
-      "bootup_state": {
-        "name": "Safe",
-        "value": 3
-      },
-      "power_state": {
-        "name": "Safe",
-        "value": 3
-      },
-      "thermal_state": {
-        "name": "Safe",
-        "value": 3
-      },
-      "security_state": {
-        "name": "None",
-        "value": 3
-      },
-      "oem": "0x0"
-    },
+    "chassis": [
+      {
+        "handle": 3,
+        "manufacturer": "Default string",
+        "version": "Default string",
+        "chassis_type": {
+          "hex": "0003",
+          "name": "Desktop",
+          "value": 3
+        },
+        "lock_present": false,
+        "bootup_state": {
+          "hex": "0003",
+          "name": "Safe",
+          "value": 3
+        },
+        "power_state": {
+          "hex": "0003",
+          "name": "Safe",
+          "value": 3
+        },
+        "thermal_state": {
+          "hex": "0003",
+          "name": "Safe",
+          "value": 3
+        },
+        "security_state": {
+          "hex": "0003",
+          "name": "None",
+          "value": 3
+        },
+        "oem": "0x0"
+      }
+    ],
     "config": {
       "handle": 34,
       "options": [
@@ -4996,18 +2546,21 @@
       {
         "handle": 35,
         "location": {
+          "hex": "0003",
           "name": "Motherboard",
           "value": 3
         },
         "usage": {
+          "hex": "0003",
           "name": "System memory",
           "value": 3
         },
         "ecc": {
+          "hex": "0003",
           "name": "None",
           "value": 3
         },
-        "max_size": 33554432,
+        "max_size": "0x2000000",
         "error_handle": 65534,
         "slots": 2
       }
@@ -5016,8 +2569,8 @@
       {
         "handle": 36,
         "array_handle": 35,
-        "start_address": 0,
-        "end_address": 25769803776,
+        "start_address": "0x0",
+        "end_address": "0x600000000",
         "part_width": 2
       }
     ],
@@ -5034,11 +2587,13 @@
         "ecc_bits": 0,
         "size": 8388608,
         "form_factor": {
+          "hex": "000d",
           "name": "SODIMM",
           "value": 13
         },
         "set": 0,
         "memory_type": {
+          "hex": "001a",
           "name": "Other",
           "value": 26
         },
@@ -5059,11 +2614,13 @@
         "ecc_bits": 0,
         "size": 16777216,
         "form_factor": {
+          "hex": "000d",
           "name": "SODIMM",
           "value": 13
         },
         "set": 0,
         "memory_type": {
+          "hex": "001a",
           "name": "Other",
           "value": 26
         },
@@ -5078,8 +2635,8 @@
         "handle": 38,
         "memory_device_handle": 37,
         "array_map_handle": 36,
-        "start_address": 0,
-        "end_address": 8589934592,
+        "start_address": "0x0",
+        "end_address": "0x200000000",
         "row_position": 255,
         "interleave_position": 1,
         "interleave_depth": 2
@@ -5088,8 +2645,8 @@
         "handle": 40,
         "memory_device_handle": 39,
         "array_map_handle": 36,
-        "start_address": 8589934592,
-        "end_address": 25769803776,
+        "start_address": "0x200000000",
+        "end_address": "0x600000000",
         "row_position": 255,
         "interleave_position": 2,
         "interleave_depth": 2
@@ -5102,6 +2659,7 @@
           {
             "name": "To Be Filled By O.E.M.",
             "type": {
+              "hex": "0003",
               "name": "Video",
               "value": 3
             },
@@ -5114,11 +2672,13 @@
       {
         "handle": 8,
         "port_type": {
+          "hex": "000e",
           "name": "Mouse Port",
           "value": 14
         },
         "internal_reference_designator": "J1A1",
         "external_connector_type": {
+          "hex": "000f",
           "name": "PS/2",
           "value": 15
         },
@@ -5127,11 +2687,13 @@
       {
         "handle": 9,
         "port_type": {
+          "hex": "000d",
           "name": "Keyboard Port",
           "value": 13
         },
         "internal_reference_designator": "J1A1",
         "external_connector_type": {
+          "hex": "000f",
           "name": "PS/2",
           "value": 15
         },
@@ -5140,11 +2702,13 @@
       {
         "handle": 10,
         "port_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
         "internal_reference_designator": "J2A1",
         "external_connector_type": {
+          "hex": "001d",
           "name": "Mini-Centronics Type-14",
           "value": 29
         },
@@ -5153,11 +2717,13 @@
       {
         "handle": 11,
         "port_type": {
+          "hex": "0009",
           "name": "Serial Port 16550A Compatible",
           "value": 9
         },
         "internal_reference_designator": "J2A2A",
         "external_connector_type": {
+          "hex": "0008",
           "name": "DB-9 pin male",
           "value": 8
         },
@@ -5166,11 +2732,13 @@
       {
         "handle": 12,
         "port_type": {
+          "hex": "001c",
           "name": "Video Port",
           "value": 28
         },
         "internal_reference_designator": "J2A2B",
         "external_connector_type": {
+          "hex": "0007",
           "name": "DB-15 pin female",
           "value": 7
         },
@@ -5179,11 +2747,13 @@
       {
         "handle": 13,
         "port_type": {
+          "hex": "0010",
           "name": "USB",
           "value": 16
         },
         "internal_reference_designator": "J3A1",
         "external_connector_type": {
+          "hex": "0012",
           "name": "Access Bus [USB]",
           "value": 18
         },
@@ -5192,11 +2762,13 @@
       {
         "handle": 14,
         "port_type": {
+          "hex": "0010",
           "name": "USB",
           "value": 16
         },
         "internal_reference_designator": "J3A1",
         "external_connector_type": {
+          "hex": "0012",
           "name": "Access Bus [USB]",
           "value": 18
         },
@@ -5205,11 +2777,13 @@
       {
         "handle": 15,
         "port_type": {
+          "hex": "0010",
           "name": "USB",
           "value": 16
         },
         "internal_reference_designator": "J3A1",
         "external_connector_type": {
+          "hex": "0012",
           "name": "Access Bus [USB]",
           "value": 18
         },
@@ -5218,10 +2792,12 @@
       {
         "handle": 16,
         "port_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
         "internal_connector_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
@@ -5230,10 +2806,12 @@
       {
         "handle": 17,
         "port_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
         "internal_connector_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
@@ -5242,10 +2820,12 @@
       {
         "handle": 18,
         "port_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
         "internal_connector_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
@@ -5254,10 +2834,12 @@
       {
         "handle": 19,
         "port_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
         "internal_connector_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
@@ -5266,10 +2848,12 @@
       {
         "handle": 20,
         "port_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
         "internal_connector_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
@@ -5278,10 +2862,12 @@
       {
         "handle": 21,
         "port_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
         "internal_connector_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
@@ -5290,10 +2876,12 @@
       {
         "handle": 22,
         "port_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
         "internal_connector_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
@@ -5302,10 +2890,12 @@
       {
         "handle": 23,
         "port_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
         "internal_connector_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
@@ -5314,10 +2904,12 @@
       {
         "handle": 24,
         "port_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
         "internal_connector_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
@@ -5326,10 +2918,12 @@
       {
         "handle": 25,
         "port_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
         "internal_connector_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
@@ -5338,10 +2932,12 @@
       {
         "handle": 26,
         "port_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
         "internal_connector_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
@@ -5350,10 +2946,12 @@
       {
         "handle": 27,
         "port_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
         "internal_connector_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
@@ -5362,10 +2960,12 @@
       {
         "handle": 28,
         "port_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
         "internal_connector_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
@@ -5374,10 +2974,12 @@
       {
         "handle": 29,
         "port_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
         "internal_connector_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
@@ -5386,10 +2988,12 @@
       {
         "handle": 30,
         "port_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
         "internal_connector_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
@@ -5398,10 +3002,12 @@
       {
         "handle": 31,
         "port_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
         "internal_connector_type": {
+          "hex": "00ff",
           "name": "Other",
           "value": 255
         },
@@ -5413,6 +3019,7 @@
         "handle": 49,
         "socket": "SOCKET 0",
         "socket_type": {
+          "hex": "0001",
           "name": "Other",
           "value": 1
         },
@@ -5421,14 +3028,17 @@
         "version": "Intel(R) Celeron(R) J4105 CPU @ 1.50GHz",
         "part": "Fill By OEM",
         "processor_type": {
+          "hex": "0003",
           "name": "CPU",
           "value": 3
         },
         "processor_family": {
+          "hex": "000f",
           "name": "Celeron",
           "value": 15
         },
         "processor_status": {
+          "hex": "0001",
           "name": "Enabled",
           "value": 1
         },
@@ -5444,18 +3054,22 @@
         "handle": 64,
         "designation": "J7H1",
         "slot_type": {
+          "hex": "00ae",
           "name": "Other",
           "value": 174
         },
         "bus_width": {
+          "hex": "000a",
           "name": "Other",
           "value": 10
         },
         "usage": {
+          "hex": "0004",
           "name": "In Use",
           "value": 4
         },
         "length": {
+          "hex": "0003",
           "name": "Short",
           "value": 3
         },
@@ -5470,18 +3084,22 @@
         "handle": 65,
         "designation": "J8H1",
         "slot_type": {
+          "hex": "00ad",
           "name": "Other",
           "value": 173
         },
         "bus_width": {
+          "hex": "0009",
           "name": "Other",
           "value": 9
         },
         "usage": {
+          "hex": "0003",
           "name": "Available",
           "value": 3
         },
         "length": {
+          "hex": "0003",
           "name": "Short",
           "value": 3
         },
@@ -5499,6 +3117,7 @@
       "product": "MZGLKAP-00",
       "version": "1.x",
       "wake_up": {
+        "hex": "0006",
         "name": "Power Switch",
         "value": 6
       }
diff --git a/machines/warwick/facter.json b/machines/warwick/facter.json
index b30a26a..58c4e41 100644
--- a/machines/warwick/facter.json
+++ b/machines/warwick/facter.json
@@ -7,7 +7,12 @@
       {
         "index": 8,
         "attached_to": 0,
+        "class_list": [
+          "pci",
+          "bridge"
+        ],
         "bus_type": {
+          "hex": "0004",
           "name": "PCI",
           "value": 4
         },
@@ -16,25 +21,31 @@
           "number": 0
         },
         "base_class": {
+          "hex": "0006",
           "name": "Bridge",
           "value": 6
         },
         "sub_class": {
+          "hex": "0004",
           "name": "PCI bridge",
           "value": 4
         },
         "pci_interface": {
+          "hex": "0000",
           "name": "Normal decode",
           "value": 0
         },
         "vendor": {
+          "hex": "14e4",
           "name": "Broadcom",
           "value": 5348
         },
         "device": {
+          "hex": "2711",
           "value": 10001
         },
         "revision": {
+          "hex": "0020",
           "value": 32
         },
         "model": "Broadcom PCI bridge",
@@ -43,7 +54,7 @@
         "resources": [
           {
             "type": "irq",
-            "base": 30,
+            "base": 35,
             "triggered": 0,
             "enabled": true
           }
@@ -53,7 +64,7 @@
           "command": 6,
           "header_type": 1,
           "secondary_bus": 1,
-          "irq": 30,
+          "irq": 35,
           "prog_if": 0
         },
         "driver": "pcieport",
@@ -82,366 +93,24 @@
         "fpu": false,
         "fpu_exception": false,
         "write_protect": false,
-        "address_sizes": {}
+        "address_sizes": {
+          "physical": "0x0",
+          "virtual": "0x0"
+        }
       }
     ],
     "disk": [
-      {
-        "index": 14,
-        "attached_to": 0,
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Disk",
-          "value": 0
-        },
-        "model": "Disk",
-        "sysfs_id": "/class/block/ram2",
-        "unix_device_name": "/dev/ram2",
-        "unix_device_number": {
-          "type": 98,
-          "major": 1,
-          "minor": 2,
-          "range": 1
-        },
-        "unix_device_names": [
-          "/dev/ram2"
-        ],
-        "resources": [
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 8192,
-            "value_2": 512
-          }
-        ]
-      },
       {
         "index": 15,
-        "attached_to": 0,
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Disk",
-          "value": 0
-        },
-        "model": "Disk",
-        "sysfs_id": "/class/block/ram0",
-        "unix_device_name": "/dev/ram0",
-        "unix_device_number": {
-          "type": 98,
-          "major": 1,
-          "minor": 0,
-          "range": 1
-        },
-        "unix_device_names": [
-          "/dev/ram0"
-        ],
-        "resources": [
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 8192,
-            "value_2": 512
-          }
-        ]
-      },
-      {
-        "index": 16,
-        "attached_to": 0,
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Disk",
-          "value": 0
-        },
-        "model": "Disk",
-        "sysfs_id": "/class/block/ram9",
-        "unix_device_name": "/dev/ram9",
-        "unix_device_number": {
-          "type": 98,
-          "major": 1,
-          "minor": 9,
-          "range": 1
-        },
-        "unix_device_names": [
-          "/dev/ram9"
-        ],
-        "resources": [
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 8192,
-            "value_2": 512
-          }
-        ]
-      },
-      {
-        "index": 17,
-        "attached_to": 0,
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Disk",
-          "value": 0
-        },
-        "model": "Disk",
-        "sysfs_id": "/class/block/ram14",
-        "unix_device_name": "/dev/ram14",
-        "unix_device_number": {
-          "type": 98,
-          "major": 1,
-          "minor": 14,
-          "range": 1
-        },
-        "unix_device_names": [
-          "/dev/ram14"
-        ],
-        "resources": [
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 8192,
-            "value_2": 512
-          }
-        ]
-      },
-      {
-        "index": 18,
-        "attached_to": 0,
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Disk",
-          "value": 0
-        },
-        "model": "Disk",
-        "sysfs_id": "/class/block/ram7",
-        "unix_device_name": "/dev/ram7",
-        "unix_device_number": {
-          "type": 98,
-          "major": 1,
-          "minor": 7,
-          "range": 1
-        },
-        "unix_device_names": [
-          "/dev/ram7"
-        ],
-        "resources": [
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 8192,
-            "value_2": 512
-          }
-        ]
-      },
-      {
-        "index": 19,
-        "attached_to": 0,
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Disk",
-          "value": 0
-        },
-        "model": "Disk",
-        "sysfs_id": "/class/block/ram12",
-        "unix_device_name": "/dev/ram12",
-        "unix_device_number": {
-          "type": 98,
-          "major": 1,
-          "minor": 12,
-          "range": 1
-        },
-        "unix_device_names": [
-          "/dev/ram12"
-        ],
-        "resources": [
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 8192,
-            "value_2": 512
-          }
-        ]
-      },
-      {
-        "index": 20,
-        "attached_to": 0,
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Disk",
-          "value": 0
-        },
-        "model": "Disk",
-        "sysfs_id": "/class/block/ram5",
-        "unix_device_name": "/dev/ram5",
-        "unix_device_number": {
-          "type": 98,
-          "major": 1,
-          "minor": 5,
-          "range": 1
-        },
-        "unix_device_names": [
-          "/dev/ram5"
-        ],
-        "resources": [
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 8192,
-            "value_2": 512
-          }
-        ]
-      },
-      {
-        "index": 21,
-        "attached_to": 0,
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Disk",
-          "value": 0
-        },
-        "model": "Disk",
-        "sysfs_id": "/class/block/ram10",
-        "unix_device_name": "/dev/ram10",
-        "unix_device_number": {
-          "type": 98,
-          "major": 1,
-          "minor": 10,
-          "range": 1
-        },
-        "unix_device_names": [
-          "/dev/ram10"
-        ],
-        "resources": [
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 8192,
-            "value_2": 512
-          }
-        ]
-      },
-      {
-        "index": 22,
-        "attached_to": 0,
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Disk",
-          "value": 0
-        },
-        "model": "Disk",
-        "sysfs_id": "/class/block/ram3",
-        "unix_device_name": "/dev/ram3",
-        "unix_device_number": {
-          "type": 98,
-          "major": 1,
-          "minor": 3,
-          "range": 1
-        },
-        "unix_device_names": [
-          "/dev/ram3"
-        ],
-        "resources": [
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 8192,
-            "value_2": 512
-          }
-        ]
-      },
-      {
-        "index": 23,
-        "attached_to": 0,
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Disk",
-          "value": 0
-        },
-        "model": "Disk",
-        "sysfs_id": "/class/block/ram1",
-        "unix_device_name": "/dev/ram1",
-        "unix_device_number": {
-          "type": 98,
-          "major": 1,
-          "minor": 1,
-          "range": 1
-        },
-        "unix_device_names": [
-          "/dev/ram1"
-        ],
-        "resources": [
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 8192,
-            "value_2": 512
-          }
-        ]
-      },
-      {
-        "index": 24,
-        "attached_to": 0,
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Disk",
-          "value": 0
-        },
-        "model": "Disk",
-        "sysfs_id": "/class/block/ram15",
-        "unix_device_name": "/dev/ram15",
-        "unix_device_number": {
-          "type": 98,
-          "major": 1,
-          "minor": 15,
-          "range": 1
-        },
-        "unix_device_names": [
-          "/dev/ram15"
-        ],
-        "resources": [
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 8192,
-            "value_2": 512
-          }
-        ]
-      },
-      {
-        "index": 25,
         "attached_to": 7,
+        "class_list": [
+          "disk",
+          "usb",
+          "scsi",
+          "block_device"
+        ],
         "bus_type": {
+          "hex": "0084",
           "name": "SCSI",
           "value": 132
         },
@@ -450,22 +119,27 @@
           "number": 0
         },
         "base_class": {
+          "hex": "0106",
           "name": "Mass Storage Device",
           "value": 262
         },
         "sub_class": {
+          "hex": "0000",
           "name": "Disk",
           "value": 0
         },
         "vendor": {
+          "hex": "090c",
           "name": "Samsung",
           "value": 2316
         },
         "device": {
+          "hex": "1000",
           "name": "Flash Drive",
           "value": 4096
         },
         "revision": {
+          "hex": "0000",
           "name": "1100",
           "value": 0
         },
@@ -482,7 +156,6 @@
           "range": 16
         },
         "unix_device_names": [
-          "/dev/disk/by-diskseq/25",
           "/dev/disk/by-id/usb-Samsung_Flash_Drive_0374021110005452-0:0",
           "/dev/disk/by-path/platform-fd500000.pcie-pci-0000:01:00.0-usb-0:1:1.0-scsi-0:0:0:0",
           "/dev/disk/by-path/platform-fd500000.pcie-pci-0000:01:00.0-usbv3-0:1:1.0-scsi-0:0:0:0",
@@ -501,7 +174,7 @@
             "cylinders": 61188,
             "heads": 64,
             "sectors": 32,
-            "size": 0,
+            "size": "0x0",
             "geo_type": "logical"
           },
           {
@@ -512,182 +185,23 @@
           }
         ],
         "driver": "usb-storage",
-        "driver_module": "usb_storage",
         "drivers": [
           "sd",
           "usb-storage"
         ],
-        "driver_modules": [
-          "usb_storage"
-        ],
         "module_alias": "usb:v090Cp1000d1100dc00dsc00dp00ic08isc06ip50in00"
-      },
-      {
-        "index": 26,
-        "attached_to": 0,
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Disk",
-          "value": 0
-        },
-        "model": "Disk",
-        "sysfs_id": "/class/block/ram8",
-        "unix_device_name": "/dev/ram8",
-        "unix_device_number": {
-          "type": 98,
-          "major": 1,
-          "minor": 8,
-          "range": 1
-        },
-        "unix_device_names": [
-          "/dev/ram8"
-        ],
-        "resources": [
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 8192,
-            "value_2": 512
-          }
-        ]
-      },
-      {
-        "index": 27,
-        "attached_to": 0,
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Disk",
-          "value": 0
-        },
-        "model": "Disk",
-        "sysfs_id": "/class/block/ram13",
-        "unix_device_name": "/dev/ram13",
-        "unix_device_number": {
-          "type": 98,
-          "major": 1,
-          "minor": 13,
-          "range": 1
-        },
-        "unix_device_names": [
-          "/dev/ram13"
-        ],
-        "resources": [
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 8192,
-            "value_2": 512
-          }
-        ]
-      },
-      {
-        "index": 28,
-        "attached_to": 0,
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Disk",
-          "value": 0
-        },
-        "model": "Disk",
-        "sysfs_id": "/class/block/ram6",
-        "unix_device_name": "/dev/ram6",
-        "unix_device_number": {
-          "type": 98,
-          "major": 1,
-          "minor": 6,
-          "range": 1
-        },
-        "unix_device_names": [
-          "/dev/ram6"
-        ],
-        "resources": [
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 8192,
-            "value_2": 512
-          }
-        ]
-      },
-      {
-        "index": 29,
-        "attached_to": 0,
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Disk",
-          "value": 0
-        },
-        "model": "Disk",
-        "sysfs_id": "/class/block/ram11",
-        "unix_device_name": "/dev/ram11",
-        "unix_device_number": {
-          "type": 98,
-          "major": 1,
-          "minor": 11,
-          "range": 1
-        },
-        "unix_device_names": [
-          "/dev/ram11"
-        ],
-        "resources": [
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 8192,
-            "value_2": 512
-          }
-        ]
-      },
-      {
-        "index": 30,
-        "attached_to": 0,
-        "base_class": {
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "name": "Disk",
-          "value": 0
-        },
-        "model": "Disk",
-        "sysfs_id": "/class/block/ram4",
-        "unix_device_name": "/dev/ram4",
-        "unix_device_number": {
-          "type": 98,
-          "major": 1,
-          "minor": 4,
-          "range": 1
-        },
-        "unix_device_names": [
-          "/dev/ram4"
-        ],
-        "resources": [
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 8192,
-            "value_2": 512
-          }
-        ]
       }
     ],
     "hub": [
       {
-        "index": 32,
+        "index": 17,
         "attached_to": 7,
+        "class_list": [
+          "usb",
+          "hub"
+        ],
         "bus_type": {
+          "hex": "0086",
           "name": "USB",
           "value": 134
         },
@@ -696,23 +210,27 @@
           "number": 0
         },
         "base_class": {
+          "hex": "010a",
           "name": "Hub",
           "value": 266
         },
         "vendor": {
-          "name": "Linux 6.1.63 xhci-hcd",
+          "hex": "1d6b",
+          "name": "Linux 6.13.12 xhci-hcd",
           "value": 7531
         },
         "device": {
+          "hex": "0002",
           "name": "xHCI Host Controller",
           "value": 2
         },
         "revision": {
-          "name": "6.01",
+          "hex": "0000",
+          "name": "6.13",
           "value": 0
         },
         "serial": "0000:01:00.0",
-        "model": "Linux 6.1.63 xhci-hcd xHCI Host Controller",
+        "model": "Linux 6.13.12 xhci-hcd xHCI Host Controller",
         "sysfs_id": "/devices/platform/scb/fd500000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0/usb1/1-0:1.0",
         "sysfs_bus_id": "1-0:1.0",
         "resources": [
@@ -727,19 +245,23 @@
         ],
         "detail": {
           "device_class": {
+            "hex": "0009",
             "name": "hub",
             "value": 9
           },
           "device_subclass": {
+            "hex": "0000",
             "name": "per_interface",
             "value": 0
           },
           "device_protocol": 1,
           "interface_class": {
+            "hex": "0009",
             "name": "hub",
             "value": 9
           },
           "interface_subclass": {
+            "hex": "0000",
             "name": "per_interface",
             "value": 0
           },
@@ -749,19 +271,20 @@
         },
         "hotplug": "usb",
         "driver": "hub",
-        "driver_module": "usbcore",
         "drivers": [
           "hub"
         ],
-        "driver_modules": [
-          "usbcore"
-        ],
-        "module_alias": "usb:v1D6Bp0002d0601dc09dsc00dp01ic09isc00ip00in00"
+        "module_alias": "usb:v1D6Bp0002d0613dc09dsc00dp01ic09isc00ip00in00"
       },
       {
-        "index": 33,
-        "attached_to": 32,
+        "index": 18,
+        "attached_to": 17,
+        "class_list": [
+          "usb",
+          "hub"
+        ],
         "bus_type": {
+          "hex": "0086",
           "name": "USB",
           "value": 134
         },
@@ -770,17 +293,21 @@
           "number": 0
         },
         "base_class": {
+          "hex": "010a",
           "name": "Hub",
           "value": 266
         },
         "vendor": {
+          "hex": "2109",
           "value": 8457
         },
         "device": {
+          "hex": "3431",
           "name": "USB2.0 Hub",
           "value": 13361
         },
         "revision": {
+          "hex": "0000",
           "name": "4.21",
           "value": 0
         },
@@ -799,19 +326,23 @@
         ],
         "detail": {
           "device_class": {
+            "hex": "0009",
             "name": "hub",
             "value": 9
           },
           "device_subclass": {
+            "hex": "0000",
             "name": "per_interface",
             "value": 0
           },
           "device_protocol": 1,
           "interface_class": {
+            "hex": "0009",
             "name": "hub",
             "value": 9
           },
           "interface_subclass": {
+            "hex": "0000",
             "name": "per_interface",
             "value": 0
           },
@@ -821,19 +352,20 @@
         },
         "hotplug": "usb",
         "driver": "hub",
-        "driver_module": "usbcore",
         "drivers": [
           "hub"
         ],
-        "driver_modules": [
-          "usbcore"
-        ],
         "module_alias": "usb:v2109p3431d0421dc09dsc00dp01ic09isc00ip00in00"
       },
       {
-        "index": 34,
+        "index": 19,
         "attached_to": 7,
+        "class_list": [
+          "usb",
+          "hub"
+        ],
         "bus_type": {
+          "hex": "0086",
           "name": "USB",
           "value": 134
         },
@@ -842,40 +374,48 @@
           "number": 0
         },
         "base_class": {
+          "hex": "010a",
           "name": "Hub",
           "value": 266
         },
         "vendor": {
-          "name": "Linux 6.1.63 xhci-hcd",
+          "hex": "1d6b",
+          "name": "Linux 6.13.12 xhci-hcd",
           "value": 7531
         },
         "device": {
+          "hex": "0003",
           "name": "xHCI Host Controller",
           "value": 3
         },
         "revision": {
-          "name": "6.01",
+          "hex": "0000",
+          "name": "6.13",
           "value": 0
         },
         "serial": "0000:01:00.0",
-        "model": "Linux 6.1.63 xhci-hcd xHCI Host Controller",
+        "model": "Linux 6.13.12 xhci-hcd xHCI Host Controller",
         "sysfs_id": "/devices/platform/scb/fd500000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0/usb2/2-0:1.0",
         "sysfs_bus_id": "2-0:1.0",
         "detail": {
           "device_class": {
+            "hex": "0009",
             "name": "hub",
             "value": 9
           },
           "device_subclass": {
+            "hex": "0000",
             "name": "per_interface",
             "value": 0
           },
           "device_protocol": 3,
           "interface_class": {
+            "hex": "0009",
             "name": "hub",
             "value": 9
           },
           "interface_subclass": {
+            "hex": "0000",
             "name": "per_interface",
             "value": 0
           },
@@ -885,25 +425,26 @@
         },
         "hotplug": "usb",
         "driver": "hub",
-        "driver_module": "usbcore",
         "drivers": [
           "hub"
         ],
-        "driver_modules": [
-          "usbcore"
-        ],
-        "module_alias": "usb:v1D6Bp0003d0601dc09dsc00dp03ic09isc00ip00in00"
+        "module_alias": "usb:v1D6Bp0003d0613dc09dsc00dp03ic09isc00ip00in00"
       }
     ],
     "memory": [
       {
         "index": 6,
         "attached_to": 0,
+        "class_list": [
+          "memory"
+        ],
         "base_class": {
+          "hex": "0101",
           "name": "Internally Used Class",
           "value": 257
         },
         "sub_class": {
+          "hex": "0002",
           "name": "Main Memory",
           "value": 2
         },
@@ -912,7 +453,7 @@
           {
             "type": "mem",
             "base": 0,
-            "range": 3964207104,
+            "range": 3932459008,
             "enabled": true,
             "access": "read_write",
             "prefetch": "unknown"
@@ -926,9 +467,13 @@
     ],
     "mmc_controller": [
       {
-        "index": 10,
+        "index": 14,
         "attached_to": 0,
+        "class_list": [
+          "mmc_controller"
+        ],
         "bus_type": {
+          "hex": "0093",
           "name": "MMC",
           "value": 147
         },
@@ -937,34 +482,56 @@
           "number": 1
         },
         "base_class": {
+          "hex": "0117",
           "name": "MMC Controller",
           "value": 279
         },
         "vendor": "",
         "device": "SDIO Controller 1",
         "model": "SDIO Controller 1",
-        "sysfs_id": "/devices/platform/soc/fe300000.mmcnr/mmc_host/mmc1/mmc1:0001",
+        "sysfs_id": "/devices/platform/soc/fe300000.mmc/mmc_host/mmc1/mmc1:0001",
         "sysfs_bus_id": "mmc1:0001"
       }
     ],
     "network_controller": [
       {
-        "index": 9,
+        "index": 10,
         "attached_to": 0,
+        "class_list": [
+          "network_controller",
+          "wlan_card"
+        ],
+        "bus_type": {
+          "hex": "0094",
+          "name": "SDIO",
+          "value": 148
+        },
+        "slot": {
+          "bus": 0,
+          "number": 0
+        },
         "base_class": {
+          "hex": "0002",
           "name": "Network controller",
           "value": 2
         },
         "sub_class": {
+          "hex": "0082",
           "name": "WLAN controller",
           "value": 130
         },
-        "device": {
-          "name": "ARM Ethernet controller",
-          "value": 0
+        "vendor": {
+          "hex": "02d0",
+          "name": "Broadcom Corp.",
+          "value": 720
         },
-        "model": "ARM Ethernet controller",
-        "sysfs_id": "/devices/platform/soc/fe300000.mmcnr/mmc_host/mmc1/mmc1:0001/mmc1:0001:1",
+        "device": {
+          "hex": "a9a6",
+          "name": "BCM43438 combo WLAN and Bluetooth Low Energy (BLE)",
+          "value": 43430
+        },
+        "model": "Broadcom BCM43438 combo WLAN and Bluetooth Low Energy (BLE)",
+        "sysfs_id": "/devices/platform/soc/fe300000.mmc/mmc_host/mmc1/mmc1:0001/mmc1:0001:1",
         "sysfs_bus_id": "mmc1:0001:1",
         "unix_device_name": "wlan0",
         "unix_device_names": [
@@ -993,16 +560,9 @@
               "9",
               "10",
               "11",
-              "12",
-              "13",
-              "14",
-              "34",
               "36",
-              "38",
               "40",
-              "42",
               "44",
-              "46",
               "48",
               "52",
               "56",
@@ -1013,7 +573,14 @@
               "108",
               "112",
               "116",
-              "120"
+              "120",
+              "124",
+              "128",
+              "132",
+              "136",
+              "140",
+              "144",
+              "149"
             ],
             "frequencies": [
               "2.412",
@@ -1027,16 +594,9 @@
               "2.452",
               "2.457",
               "2.462",
-              "2.467",
-              "2.472",
-              "2.484",
-              "5.17",
               "5.18",
-              "5.19",
               "5.2",
-              "5.21",
               "5.22",
-              "5.23",
               "5.24",
               "5.26",
               "5.28",
@@ -1047,7 +607,14 @@
               "5.54",
               "5.56",
               "5.58",
-              "5.6"
+              "5.6",
+              "5.62",
+              "5.64",
+              "5.66",
+              "5.68",
+              "5.7",
+              "5.72",
+              "5.745"
             ],
             "auth_modes": [
               "open",
@@ -1073,60 +640,71 @@
           "brcmfmac",
           "brcmfmac"
         ],
-        "module_alias": "of:NmmcnrT(null)Cbrcm,bcm2835-mmcCbrcm,bcm2835-sdhci"
+        "module_alias": "sdio:c00v02D0dA9A6"
       },
       {
         "index": 12,
-        "attached_to": 10,
-        "bus_type": {
-          "name": "SDIO",
-          "value": 148
-        },
-        "slot": {
-          "bus": 0,
-          "number": 0
-        },
+        "attached_to": 0,
+        "class_list": [
+          "network_controller"
+        ],
         "base_class": {
+          "hex": "0002",
           "name": "Network controller",
           "value": 2
         },
         "sub_class": {
-          "name": "Network controller",
-          "value": 128
-        },
-        "vendor": {
-          "name": "Broadcom Corp.",
-          "value": 720
+          "hex": "0000",
+          "name": "Ethernet controller",
+          "value": 0
         },
         "device": {
-          "name": "BCM43430 WLAN card",
-          "value": 43430
+          "hex": "0000",
+          "name": "ARM Ethernet controller",
+          "value": 0
         },
-        "model": "Broadcom BCM43430 WLAN card",
-        "sysfs_id": "/devices/platform/soc/fe300000.mmcnr/mmc_host/mmc1/mmc1:0001/mmc1:0001:1",
-        "sysfs_bus_id": "mmc1:0001:1",
-        "driver": "brcmfmac",
-        "driver_module": "brcmfmac",
+        "model": "ARM Ethernet controller",
+        "sysfs_id": "/devices/platform/scb/fd580000.ethernet",
+        "sysfs_bus_id": "fd580000.ethernet",
+        "unix_device_name": "end0",
+        "unix_device_names": [
+          "end0"
+        ],
+        "resources": [
+          {
+            "type": "hwaddr",
+            "address": 100
+          },
+          {
+            "type": "phwaddr",
+            "address": 100
+          }
+        ],
+        "driver": "bcmgenet",
+        "driver_module": "genet",
         "drivers": [
-          "brcmfmac"
+          "bcmgenet"
         ],
         "driver_modules": [
-          "brcmfmac",
-          "brcmfmac",
-          "brcmfmac"
+          "genet"
         ],
-        "module_alias": "sdio:c00v02D0dA9A6"
+        "module_alias": "of:NethernetT(null)Cbrcm,bcm2711-genet-v5"
       }
     ],
     "network_interface": [
       {
-        "index": 36,
-        "attached_to": 0,
+        "index": 20,
+        "attached_to": 12,
+        "class_list": [
+          "network_interface"
+        ],
         "base_class": {
+          "hex": "0107",
           "name": "Network Interface",
           "value": 263
         },
         "sub_class": {
+          "hex": "0001",
           "name": "Ethernet",
           "value": 1
         },
@@ -1148,42 +726,33 @@
           }
         ],
         "driver": "bcmgenet",
+        "driver_module": "genet",
         "drivers": [
           "bcmgenet"
+        ],
+        "driver_modules": [
+          "genet"
         ]
       },
       {
-        "index": 37,
-        "attached_to": 0,
-        "base_class": {
-          "name": "Network Interface",
-          "value": 263
-        },
-        "sub_class": {
-          "name": "Loopback",
-          "value": 0
-        },
-        "model": "Loopback network interface",
-        "sysfs_id": "/class/net/lo",
-        "unix_device_name": "lo",
-        "unix_device_names": [
-          "lo"
-        ]
-      },
-      {
-        "index": 38,
-        "attached_to": 9,
+        "index": 21,
+        "attached_to": 10,
+        "class_list": [
+          "network_interface"
+        ],
         "base_class": {
+          "hex": "0107",
           "name": "Network Interface",
           "value": 263
         },
         "sub_class": {
+          "hex": "000a",
           "name": "WLAN",
           "value": 10
         },
         "model": "WLAN network interface",
         "sysfs_id": "/class/net/wlan0",
-        "sysfs_device_link": "/devices/platform/soc/fe300000.mmcnr/mmc_host/mmc1/mmc1:0001/mmc1:0001:1",
+        "sysfs_device_link": "/devices/platform/soc/fe300000.mmc/mmc_host/mmc1/mmc1:0001/mmc1:0001:1",
         "unix_device_name": "wlan0",
         "unix_device_names": [
           "wlan0"
@@ -1208,14 +777,41 @@
           "brcmfmac",
           "brcmfmac"
         ]
+      },
+      {
+        "index": 22,
+        "attached_to": 0,
+        "class_list": [
+          "network_interface"
+        ],
+        "base_class": {
+          "hex": "0107",
+          "name": "Network Interface",
+          "value": 263
+        },
+        "sub_class": {
+          "hex": "0000",
+          "name": "Loopback",
+          "value": 0
+        },
+        "model": "Loopback network interface",
+        "sysfs_id": "/class/net/lo",
+        "unix_device_name": "lo",
+        "unix_device_names": [
+          "lo"
+        ]
       }
     ],
     "system": {},
     "unknown": [
       {
-        "index": 11,
-        "attached_to": 10,
+        "index": 9,
+        "attached_to": 0,
+        "class_list": [
+          "unknown"
+        ],
         "bus_type": {
+          "hex": "0094",
           "name": "SDIO",
           "value": 148
         },
@@ -1224,30 +820,38 @@
           "number": 0
         },
         "base_class": {
+          "hex": "0000",
           "name": "Unclassified device",
           "value": 0
         },
         "sub_class": {
+          "hex": "0000",
           "name": "Unclassified device",
           "value": 0
         },
         "vendor": {
+          "hex": "02d0",
           "name": "Broadcom Corp.",
           "value": 720
         },
         "device": {
-          "name": "BCM43430 WLAN card",
+          "hex": "a9a6",
+          "name": "BCM43438 combo WLAN and Bluetooth Low Energy (BLE)",
           "value": 43430
         },
-        "model": "Broadcom BCM43430 WLAN card",
-        "sysfs_id": "/devices/platform/soc/fe300000.mmcnr/mmc_host/mmc1/mmc1:0001/mmc1:0001:3",
+        "model": "Broadcom BCM43438 combo WLAN and Bluetooth Low Energy (BLE)",
+        "sysfs_id": "/devices/platform/soc/fe300000.mmc/mmc_host/mmc1/mmc1:0001/mmc1:0001:3",
         "sysfs_bus_id": "mmc1:0001:3",
         "module_alias": "sdio:c02v02D0dA9A6"
       },
       {
-        "index": 13,
-        "attached_to": 10,
+        "index": 11,
+        "attached_to": 0,
+        "class_list": [
+          "unknown"
+        ],
         "bus_type": {
+          "hex": "0094",
           "name": "SDIO",
           "value": 148
         },
@@ -1256,23 +860,27 @@
           "number": 0
         },
         "base_class": {
+          "hex": "0000",
           "name": "Unclassified device",
           "value": 0
         },
         "sub_class": {
+          "hex": "0000",
           "name": "Unclassified device",
           "value": 0
         },
         "vendor": {
+          "hex": "02d0",
           "name": "Broadcom Corp.",
           "value": 720
         },
         "device": {
-          "name": "BCM43430 WLAN card",
+          "hex": "a9a6",
+          "name": "BCM43438 combo WLAN and Bluetooth Low Energy (BLE)",
           "value": 43430
         },
-        "model": "Broadcom BCM43430 WLAN card",
-        "sysfs_id": "/devices/platform/soc/fe300000.mmcnr/mmc_host/mmc1/mmc1:0001/mmc1:0001:2",
+        "model": "Broadcom BCM43438 combo WLAN and Bluetooth Low Energy (BLE)",
+        "sysfs_id": "/devices/platform/soc/fe300000.mmc/mmc_host/mmc1/mmc1:0001/mmc1:0001:2",
         "sysfs_bus_id": "mmc1:0001:2",
         "driver": "brcmfmac",
         "driver_module": "brcmfmac",
@@ -1291,7 +899,12 @@
       {
         "index": 7,
         "attached_to": 8,
+        "class_list": [
+          "usb_controller",
+          "pci"
+        ],
         "bus_type": {
+          "hex": "0004",
           "name": "PCI",
           "value": 4
         },
@@ -1300,29 +913,37 @@
           "number": 0
         },
         "base_class": {
+          "hex": "000c",
           "name": "Serial bus controller",
           "value": 12
         },
         "sub_class": {
+          "hex": "0003",
           "name": "USB Controller",
           "value": 3
         },
         "pci_interface": {
+          "hex": "0030",
           "value": 48
         },
         "vendor": {
+          "hex": "1106",
           "value": 4358
         },
         "sub_vendor": {
+          "hex": "1106",
           "value": 4358
         },
         "device": {
+          "hex": "3483",
           "value": 13443
         },
         "sub_device": {
+          "hex": "3483",
           "value": 13443
         },
         "revision": {
+          "hex": "0001",
           "value": 1
         },
         "model": "USB Controller",
@@ -1331,7 +952,7 @@
         "resources": [
           {
             "type": "irq",
-            "base": 37,
+            "base": 36,
             "triggered": 0,
             "enabled": true
           },
@@ -1349,18 +970,64 @@
           "command": 1350,
           "header_type": 0,
           "secondary_bus": 0,
-          "irq": 37,
+          "irq": 36,
           "prog_if": 48
         },
         "driver": "xhci_hcd",
-        "driver_module": "xhci_pci",
         "drivers": [
           "xhci_hcd"
         ],
-        "driver_modules": [
-          "xhci_pci"
-        ],
         "module_alias": "pci:v00001106d00003483sv00001106sd00003483bc0Csc03i30"
+      },
+      {
+        "index": 13,
+        "attached_to": 0,
+        "class_list": [
+          "usb_controller"
+        ],
+        "base_class": {
+          "hex": "000c",
+          "name": "Serial bus controller",
+          "value": 12
+        },
+        "sub_class": {
+          "hex": "0003",
+          "name": "USB Controller",
+          "value": 3
+        },
+        "pci_interface": {
+          "hex": "0000",
+          "name": "UHCI",
+          "value": 0
+        },
+        "device": {
+          "hex": "0000",
+          "name": "ARM USB controller",
+          "value": 0
+        },
+        "model": "ARM USB controller",
+        "sysfs_id": "/devices/platform/soc/fe980000.usb",
+        "sysfs_bus_id": "fe980000.usb",
+        "driver": "dwc2",
+        "drivers": [
+          "dwc2"
+        ],
+        "driver_info": {
+          "type": "module",
+          "db_entry_0": [
+            "uhci-hcd"
+          ],
+          "active": false,
+          "modprobe": true,
+          "names": [
+            "uhci-hcd"
+          ],
+          "module_args": [
+            ""
+          ],
+          "conf": ""
+        },
+        "module_alias": "of:NusbT(null)Cbrcm,bcm2835-usb"
       }
     ]
   },