diff --git a/systems/kuraokami/facter.json b/systems/kuraokami/facter.json
index 46cf897..b7538dd 100644
--- a/systems/kuraokami/facter.json
+++ b/systems/kuraokami/facter.json
@@ -25,6 +25,10 @@
       {
         "index": 73,
         "attached_to": 85,
+        "class_list": [
+          "usb",
+          "bluetooth"
+        ],
         "bus_type": {
           "name": "USB",
           "value": 134
@@ -96,6 +100,10 @@
       {
         "index": 86,
         "attached_to": 85,
+        "class_list": [
+          "usb",
+          "bluetooth"
+        ],
         "bus_type": {
           "name": "USB",
           "value": 134
@@ -169,6 +177,10 @@
       {
         "index": 29,
         "attached_to": 0,
+        "class_list": [
+          "pci",
+          "bridge"
+        ],
         "bus_type": {
           "name": "PCI",
           "value": 4
@@ -233,6 +245,10 @@
       {
         "index": 32,
         "attached_to": 0,
+        "class_list": [
+          "pci",
+          "bridge"
+        ],
         "bus_type": {
           "name": "PCI",
           "value": 4
@@ -282,6 +298,10 @@
       {
         "index": 34,
         "attached_to": 0,
+        "class_list": [
+          "pci",
+          "bridge"
+        ],
         "bus_type": {
           "name": "PCI",
           "value": 4
@@ -346,6 +366,10 @@
       {
         "index": 38,
         "attached_to": 0,
+        "class_list": [
+          "pci",
+          "bridge"
+        ],
         "bus_type": {
           "name": "PCI",
           "value": 4
@@ -410,6 +434,10 @@
       {
         "index": 40,
         "attached_to": 0,
+        "class_list": [
+          "pci",
+          "bridge"
+        ],
         "bus_type": {
           "name": "PCI",
           "value": 4
@@ -474,6 +502,10 @@
       {
         "index": 42,
         "attached_to": 0,
+        "class_list": [
+          "pci",
+          "bridge"
+        ],
         "bus_type": {
           "name": "PCI",
           "value": 4
@@ -523,6 +555,10 @@
       {
         "index": 43,
         "attached_to": 0,
+        "class_list": [
+          "pci",
+          "bridge"
+        ],
         "bus_type": {
           "name": "PCI",
           "value": 4
@@ -587,6 +623,10 @@
       {
         "index": 47,
         "attached_to": 0,
+        "class_list": [
+          "pci",
+          "bridge"
+        ],
         "bus_type": {
           "name": "PCI",
           "value": 4
@@ -651,6 +691,10 @@
       {
         "index": 49,
         "attached_to": 0,
+        "class_list": [
+          "pci",
+          "bridge"
+        ],
         "bus_type": {
           "name": "PCI",
           "value": 4
@@ -717,6 +761,11 @@
       {
         "index": 63,
         "attached_to": 28,
+        "class_list": [
+          "cdrom",
+          "scsi",
+          "block_device"
+        ],
         "bus_type": {
           "name": "SCSI",
           "value": 132
@@ -968,6 +1017,11 @@
       {
         "index": 61,
         "attached_to": 33,
+        "class_list": [
+          "disk",
+          "block_device",
+          "nvme"
+        ],
         "bus_type": {
           "name": "NVME",
           "value": 150
@@ -1045,6 +1099,11 @@
       {
         "index": 62,
         "attached_to": 28,
+        "class_list": [
+          "disk",
+          "ide",
+          "block_device"
+        ],
         "bus_type": {
           "name": "IDE",
           "value": 133
@@ -1119,6 +1178,11 @@
       {
         "index": 64,
         "attached_to": 28,
+        "class_list": [
+          "disk",
+          "ide",
+          "block_device"
+        ],
         "bus_type": {
           "name": "IDE",
           "value": 133
@@ -1199,6 +1263,10 @@
       {
         "index": 37,
         "attached_to": 34,
+        "class_list": [
+          "graphics_card",
+          "pci"
+        ],
         "bus_type": {
           "name": "PCI",
           "value": 4
@@ -1306,6 +1374,10 @@
       {
         "index": 53,
         "attached_to": 0,
+        "class_list": [
+          "graphics_card",
+          "pci"
+        ],
         "bus_type": {
           "name": "PCI",
           "value": 4
@@ -1408,6 +1480,10 @@
       {
         "index": 66,
         "attached_to": 93,
+        "class_list": [
+          "usb",
+          "hub"
+        ],
         "bus_type": {
           "name": "USB",
           "value": 134
@@ -1467,6 +1543,10 @@
       {
         "index": 70,
         "attached_to": 85,
+        "class_list": [
+          "usb",
+          "hub"
+        ],
         "bus_type": {
           "name": "USB",
           "value": 134
@@ -1536,6 +1616,10 @@
       {
         "index": 85,
         "attached_to": 54,
+        "class_list": [
+          "usb",
+          "hub"
+        ],
         "bus_type": {
           "name": "USB",
           "value": 134
@@ -1606,6 +1690,10 @@
       {
         "index": 93,
         "attached_to": 54,
+        "class_list": [
+          "usb",
+          "hub"
+        ],
         "bus_type": {
           "name": "USB",
           "value": 134
@@ -1666,6 +1754,10 @@
       {
         "index": 94,
         "attached_to": 85,
+        "class_list": [
+          "usb",
+          "hub"
+        ],
         "bus_type": {
           "name": "USB",
           "value": 134
@@ -1736,6 +1828,10 @@
       {
         "index": 78,
         "attached_to": 70,
+        "class_list": [
+          "keyboard",
+          "usb"
+        ],
         "bus_type": {
           "name": "USB",
           "value": 134
@@ -1767,18 +1863,18 @@
         "model": "Razer BlackWidow Chroma",
         "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb1/1-10/1-10.1/1-10.1:1.0",
         "sysfs_bus_id": "1-10.1:1.0",
-        "unix_device_name": "/dev/input/event14",
+        "unix_device_name": "/dev/input/event13",
         "unix_device_number": {
           "type": 99,
           "major": 13,
-          "minor": 78,
+          "minor": 77,
           "range": 1
         },
         "unix_device_names": [
           "/dev/input/by-id/usb-Razer_Razer_BlackWidow_Chroma-event-kbd",
           "/dev/input/by-path/pci-0000:00:14.0-usb-0:10.1:1.0-event-kbd",
           "/dev/input/by-path/pci-0000:00:14.0-usbv2-0:10.1:1.0-event-kbd",
-          "/dev/input/event14"
+          "/dev/input/event13"
         ],
         "resources": [
           {
@@ -1833,6 +1929,9 @@
       {
         "index": 27,
         "attached_to": 0,
+        "class_list": [
+          "memory"
+        ],
         "base_class": {
           "name": "Internally Used Class",
           "value": 257
@@ -1846,7 +1945,7 @@
           {
             "type": "mem",
             "base": 0,
-            "range": 66661257216,
+            "range": 66661244928,
             "enabled": true,
             "access": "read_write",
             "prefetch": "unknown"
@@ -1862,6 +1961,9 @@
       {
         "index": 57,
         "attached_to": 37,
+        "class_list": [
+          "monitor"
+        ],
         "base_class": {
           "name": "Monitor",
           "value": 256
@@ -2043,7 +2145,153 @@
       },
       {
         "index": 58,
+        "attached_to": 37,
+        "class_list": [
+          "monitor"
+        ],
+        "base_class": {
+          "name": "Monitor",
+          "value": 256
+        },
+        "sub_class": {
+          "name": "LCD Monitor",
+          "value": 2
+        },
+        "vendor": {
+          "name": "EIZO",
+          "value": 5571
+        },
+        "device": {
+          "name": "EV2316W",
+          "value": 9107
+        },
+        "serial": "36270122",
+        "model": "EIZO EV2316W",
+        "resources": [
+          {
+            "type": "monitor",
+            "width": 1024,
+            "height": 768,
+            "vertical_frequency": 60,
+            "interlaced": false
+          },
+          {
+            "type": "monitor",
+            "width": 1280,
+            "height": 1024,
+            "vertical_frequency": 60,
+            "interlaced": false
+          },
+          {
+            "type": "monitor",
+            "width": 1280,
+            "height": 720,
+            "vertical_frequency": 60,
+            "interlaced": false
+          },
+          {
+            "type": "monitor",
+            "width": 1280,
+            "height": 960,
+            "vertical_frequency": 60,
+            "interlaced": false
+          },
+          {
+            "type": "monitor",
+            "width": 1920,
+            "height": 1080,
+            "vertical_frequency": 60,
+            "interlaced": false
+          },
+          {
+            "type": "monitor",
+            "width": 640,
+            "height": 480,
+            "vertical_frequency": 60,
+            "interlaced": false
+          },
+          {
+            "type": "monitor",
+            "width": 800,
+            "height": 600,
+            "vertical_frequency": 60,
+            "interlaced": false
+          },
+          {
+            "type": "size",
+            "unit": "mm",
+            "value_1": 510,
+            "value_2": 287
+          }
+        ],
+        "detail": {
+          "manufacture_year": 2012,
+          "manufacture_week": 53,
+          "vertical_sync": {
+            "min": 59,
+            "max": 61
+          },
+          "horizontal_sync": {
+            "min": 31,
+            "max": 68
+          },
+          "horizontal_sync_timings": {
+            "disp": 1920,
+            "sync_start": 2008,
+            "sync_end": 2052,
+            "total": 2200
+          },
+          "vertical_sync_timings": {
+            "disp": 1080,
+            "sync_start": 1084,
+            "sync_end": 1089,
+            "total": 1125
+          },
+          "clock": 148500,
+          "width": 1920,
+          "height": 1080,
+          "width_millimetres": 510,
+          "height_millimetres": 287,
+          "horizontal_flag": 43,
+          "vertical_flag": 43,
+          "vendor": "",
+          "name": "EV2316W"
+        },
+        "driver_info": {
+          "type": "display",
+          "width": 1920,
+          "height": 1080,
+          "vertical_sync": {
+            "min": 59,
+            "max": 61
+          },
+          "horizontal_sync": {
+            "min": 31,
+            "max": 68
+          },
+          "bandwidth": 0,
+          "horizontal_sync_timings": {
+            "disp": 1920,
+            "sync_start": 2008,
+            "sync_end": 2052,
+            "total": 2200
+          },
+          "vertical_sync_timings": {
+            "disp": 1080,
+            "sync_start": 1084,
+            "sync_end": 1089,
+            "total": 1125
+          },
+          "horizontal_flag": 43,
+          "vertical_flag": 43
+        }
+      },
+      {
+        "index": 59,
         "attached_to": 53,
+        "class_list": [
+          "monitor"
+        ],
         "base_class": {
           "name": "Monitor",
           "value": 256
@@ -2187,152 +2435,16 @@
           "horizontal_flag": 45,
           "vertical_flag": 43
         }
-      },
-      {
-        "index": 59,
-        "attached_to": 53,
-        "base_class": {
-          "name": "Monitor",
-          "value": 256
-        },
-        "sub_class": {
-          "name": "LCD Monitor",
-          "value": 2
-        },
-        "vendor": {
-          "name": "EIZO",
-          "value": 5571
-        },
-        "device": {
-          "name": "EV2316W",
-          "value": 9107
-        },
-        "serial": "36270122",
-        "model": "EIZO EV2316W",
-        "resources": [
-          {
-            "type": "monitor",
-            "width": 1024,
-            "height": 768,
-            "vertical_frequency": 60,
-            "interlaced": false
-          },
-          {
-            "type": "monitor",
-            "width": 1280,
-            "height": 1024,
-            "vertical_frequency": 60,
-            "interlaced": false
-          },
-          {
-            "type": "monitor",
-            "width": 1280,
-            "height": 720,
-            "vertical_frequency": 60,
-            "interlaced": false
-          },
-          {
-            "type": "monitor",
-            "width": 1280,
-            "height": 960,
-            "vertical_frequency": 60,
-            "interlaced": false
-          },
-          {
-            "type": "monitor",
-            "width": 1920,
-            "height": 1080,
-            "vertical_frequency": 60,
-            "interlaced": false
-          },
-          {
-            "type": "monitor",
-            "width": 640,
-            "height": 480,
-            "vertical_frequency": 60,
-            "interlaced": false
-          },
-          {
-            "type": "monitor",
-            "width": 800,
-            "height": 600,
-            "vertical_frequency": 60,
-            "interlaced": false
-          },
-          {
-            "type": "size",
-            "unit": "mm",
-            "value_1": 510,
-            "value_2": 287
-          }
-        ],
-        "detail": {
-          "manufacture_year": 2012,
-          "manufacture_week": 53,
-          "vertical_sync": {
-            "min": 59,
-            "max": 61
-          },
-          "horizontal_sync": {
-            "min": 31,
-            "max": 68
-          },
-          "horizontal_sync_timings": {
-            "disp": 1920,
-            "sync_start": 2008,
-            "sync_end": 2052,
-            "total": 2200
-          },
-          "vertical_sync_timings": {
-            "disp": 1080,
-            "sync_start": 1084,
-            "sync_end": 1089,
-            "total": 1125
-          },
-          "clock": 148500,
-          "width": 1920,
-          "height": 1080,
-          "width_millimetres": 510,
-          "height_millimetres": 287,
-          "horizontal_flag": 43,
-          "vertical_flag": 43,
-          "vendor": "",
-          "name": "EV2316W"
-        },
-        "driver_info": {
-          "type": "display",
-          "width": 1920,
-          "height": 1080,
-          "vertical_sync": {
-            "min": 59,
-            "max": 61
-          },
-          "horizontal_sync": {
-            "min": 31,
-            "max": 68
-          },
-          "bandwidth": 0,
-          "horizontal_sync_timings": {
-            "disp": 1920,
-            "sync_start": 2008,
-            "sync_end": 2052,
-            "total": 2200
-          },
-          "vertical_sync_timings": {
-            "disp": 1080,
-            "sync_start": 1084,
-            "sync_end": 1089,
-            "total": 1125
-          },
-          "horizontal_flag": 43,
-          "vertical_flag": 43
-        }
       }
     ],
     "mouse": [
       {
         "index": 75,
         "attached_to": 70,
+        "class_list": [
+          "mouse",
+          "usb"
+        ],
         "bus_type": {
           "name": "USB",
           "value": 134
@@ -2440,6 +2552,10 @@
       {
         "index": 92,
         "attached_to": 70,
+        "class_list": [
+          "mouse",
+          "usb"
+        ],
         "bus_type": {
           "name": "USB",
           "value": 134
@@ -2550,6 +2666,11 @@
       {
         "index": 35,
         "attached_to": 0,
+        "class_list": [
+          "network_controller",
+          "pci",
+          "wlan_card"
+        ],
         "bus_type": {
           "name": "PCI",
           "value": 4
@@ -2719,6 +2840,10 @@
       {
         "index": 45,
         "attached_to": 40,
+        "class_list": [
+          "network_controller",
+          "pci"
+        ],
         "bus_type": {
           "name": "PCI",
           "value": 4
@@ -2811,63 +2936,11 @@
     ],
     "network_interface": [
       {
-        "index": 96,
-        "attached_to": 45,
-        "base_class": {
-          "name": "Network Interface",
-          "value": 263
-        },
-        "sub_class": {
-          "name": "Ethernet",
-          "value": 1
-        },
-        "model": "Ethernet network interface",
-        "sysfs_id": "/class/net/enp6s0",
-        "sysfs_device_link": "/devices/pci0000:00/0000:00:1c.3/0000:06:00.0",
-        "unix_device_name": "enp6s0",
-        "unix_device_names": [
-          "enp6s0"
-        ],
-        "resources": [
-          {
-            "type": "hwaddr",
-            "address": 53
-          },
-          {
-            "type": "phwaddr",
-            "address": 53
-          }
-        ],
-        "driver": "igc",
-        "driver_module": "igc",
-        "drivers": [
-          "igc"
-        ],
-        "driver_modules": [
-          "igc"
-        ]
-      },
-      {
-        "index": 97,
-        "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": 98,
+        "index": 95,
         "attached_to": 35,
+        "class_list": [
+          "network_interface"
+        ],
         "base_class": {
           "name": "Network Interface",
           "value": 263
@@ -2901,12 +2974,749 @@
         "driver_modules": [
           "iwlwifi"
         ]
+      },
+      {
+        "index": 99,
+        "attached_to": 0,
+        "class_list": [
+          "network_interface"
+        ],
+        "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": 100,
+        "attached_to": 45,
+        "class_list": [
+          "network_interface"
+        ],
+        "base_class": {
+          "name": "Network Interface",
+          "value": 263
+        },
+        "sub_class": {
+          "name": "Ethernet",
+          "value": 1
+        },
+        "model": "Ethernet network interface",
+        "sysfs_id": "/class/net/enp6s0",
+        "sysfs_device_link": "/devices/pci0000:00/0000:00:1c.3/0000:06:00.0",
+        "unix_device_name": "enp6s0",
+        "unix_device_names": [
+          "enp6s0"
+        ],
+        "resources": [
+          {
+            "type": "hwaddr",
+            "address": 53
+          },
+          {
+            "type": "phwaddr",
+            "address": 53
+          }
+        ],
+        "driver": "igc",
+        "driver_module": "igc",
+        "drivers": [
+          "igc"
+        ],
+        "driver_modules": [
+          "igc"
+        ]
+      }
+    ],
+    "pci": [
+      {
+        "index": 30,
+        "attached_to": 0,
+        "class_list": [
+          "pci",
+          "unknown"
+        ],
+        "bus_type": {
+          "name": "PCI",
+          "value": 4
+        },
+        "slot": {
+          "bus": 0,
+          "number": 8
+        },
+        "base_class": {
+          "name": "Generic system peripheral",
+          "value": 8
+        },
+        "sub_class": {
+          "name": "System peripheral",
+          "value": 128
+        },
+        "vendor": {
+          "name": "Intel Corporation",
+          "value": 32902
+        },
+        "sub_vendor": {
+          "value": 4163
+        },
+        "device": {
+          "value": 17999
+        },
+        "sub_device": {
+          "value": 34452
+        },
+        "revision": {
+          "value": 2
+        },
+        "model": "Intel System peripheral",
+        "sysfs_id": "/devices/pci0000:00/0000:00:08.0",
+        "sysfs_bus_id": "0000:00:08.0",
+        "resources": [
+          {
+            "type": "irq",
+            "base": 255,
+            "triggered": 0,
+            "enabled": true
+          },
+          {
+            "type": "mem",
+            "base": 451141607424,
+            "range": 4096,
+            "enabled": false,
+            "access": "read_write",
+            "prefetch": "no"
+          }
+        ],
+        "detail": {
+          "function": 0,
+          "command": 0,
+          "header_type": 0,
+          "secondary_bus": 0,
+          "irq": 255,
+          "prog_if": 0
+        },
+        "module_alias": "pci:v00008086d0000464Fsv00001043sd00008694bc08sc80i00",
+        "label": "Onboard - Other"
+      },
+      {
+        "index": 31,
+        "attached_to": 0,
+        "class_list": [
+          "pci",
+          "unknown"
+        ],
+        "bus_type": {
+          "name": "PCI",
+          "value": 4
+        },
+        "slot": {
+          "bus": 0,
+          "number": 21
+        },
+        "base_class": {
+          "name": "Serial bus controller",
+          "value": 12
+        },
+        "sub_class": {
+          "value": 128
+        },
+        "vendor": {
+          "name": "Intel Corporation",
+          "value": 32902
+        },
+        "sub_vendor": {
+          "value": 4163
+        },
+        "device": {
+          "value": 31437
+        },
+        "sub_device": {
+          "value": 34452
+        },
+        "revision": {
+          "value": 17
+        },
+        "model": "Intel Serial bus controller",
+        "sysfs_id": "/devices/pci0000:00/0000:00:15.1",
+        "sysfs_bus_id": "0000:00:15.1",
+        "resources": [
+          {
+            "type": "irq",
+            "base": 40,
+            "triggered": 0,
+            "enabled": true
+          },
+          {
+            "type": "mem",
+            "base": 275150540800,
+            "range": 4096,
+            "enabled": true,
+            "access": "read_write",
+            "prefetch": "no"
+          }
+        ],
+        "detail": {
+          "function": 1,
+          "command": 6,
+          "header_type": 0,
+          "secondary_bus": 0,
+          "irq": 40,
+          "prog_if": 0
+        },
+        "driver": "intel-lpss",
+        "driver_module": "intel_lpss_pci",
+        "drivers": [
+          "intel-lpss"
+        ],
+        "driver_modules": [
+          "intel_lpss_pci"
+        ],
+        "module_alias": "pci:v00008086d00007ACDsv00001043sd00008694bc0Csc80i00",
+        "label": "Onboard - Other"
+      },
+      {
+        "index": 36,
+        "attached_to": 0,
+        "class_list": [
+          "pci",
+          "unknown"
+        ],
+        "bus_type": {
+          "name": "PCI",
+          "value": 4
+        },
+        "slot": {
+          "bus": 0,
+          "number": 22
+        },
+        "base_class": {
+          "name": "Communication controller",
+          "value": 7
+        },
+        "sub_class": {
+          "name": "Communication controller",
+          "value": 128
+        },
+        "vendor": {
+          "name": "Intel Corporation",
+          "value": 32902
+        },
+        "sub_vendor": {
+          "value": 4163
+        },
+        "device": {
+          "value": 31464
+        },
+        "sub_device": {
+          "value": 34452
+        },
+        "revision": {
+          "value": 17
+        },
+        "model": "Intel Communication controller",
+        "sysfs_id": "/devices/pci0000:00/0000:00:16.0",
+        "sysfs_bus_id": "0000:00:16.0",
+        "resources": [
+          {
+            "type": "irq",
+            "base": 154,
+            "triggered": 0,
+            "enabled": true
+          },
+          {
+            "type": "mem",
+            "base": 451141586944,
+            "range": 4096,
+            "enabled": true,
+            "access": "read_write",
+            "prefetch": "no"
+          }
+        ],
+        "detail": {
+          "function": 0,
+          "command": 1030,
+          "header_type": 0,
+          "secondary_bus": 0,
+          "irq": 154,
+          "prog_if": 0
+        },
+        "driver": "mei_me",
+        "driver_module": "mei_me",
+        "drivers": [
+          "mei_me"
+        ],
+        "driver_modules": [
+          "mei_me"
+        ],
+        "module_alias": "pci:v00008086d00007AE8sv00001043sd00008694bc07sc80i00",
+        "label": "Onboard - Other"
+      },
+      {
+        "index": 39,
+        "attached_to": 0,
+        "class_list": [
+          "pci",
+          "unknown"
+        ],
+        "bus_type": {
+          "name": "PCI",
+          "value": 4
+        },
+        "slot": {
+          "bus": 0,
+          "number": 31
+        },
+        "base_class": {
+          "name": "Serial bus controller",
+          "value": 12
+        },
+        "sub_class": {
+          "value": 128
+        },
+        "vendor": {
+          "name": "Intel Corporation",
+          "value": 32902
+        },
+        "sub_vendor": {
+          "value": 4163
+        },
+        "device": {
+          "value": 31396
+        },
+        "sub_device": {
+          "value": 34452
+        },
+        "revision": {
+          "value": 17
+        },
+        "model": "Intel Serial bus controller",
+        "sysfs_id": "/devices/pci0000:00/0000:00:1f.5",
+        "sysfs_bus_id": "0000:00:1f.5",
+        "resources": [
+          {
+            "type": "mem",
+            "base": 2155872256,
+            "range": 4096,
+            "enabled": true,
+            "access": "read_write",
+            "prefetch": "no"
+          }
+        ],
+        "detail": {
+          "function": 5,
+          "command": 1026,
+          "header_type": 0,
+          "secondary_bus": 0,
+          "irq": 0,
+          "prog_if": 0
+        },
+        "driver": "intel-spi",
+        "driver_module": "spi_intel_pci",
+        "drivers": [
+          "intel-spi"
+        ],
+        "driver_modules": [
+          "spi_intel_pci"
+        ],
+        "module_alias": "pci:v00008086d00007AA4sv00001043sd00008694bc0Csc80i00",
+        "label": "Onboard - Other"
+      },
+      {
+        "index": 44,
+        "attached_to": 0,
+        "class_list": [
+          "pci",
+          "unknown"
+        ],
+        "bus_type": {
+          "name": "PCI",
+          "value": 4
+        },
+        "slot": {
+          "bus": 0,
+          "number": 21
+        },
+        "base_class": {
+          "name": "Serial bus controller",
+          "value": 12
+        },
+        "sub_class": {
+          "value": 128
+        },
+        "vendor": {
+          "name": "Intel Corporation",
+          "value": 32902
+        },
+        "sub_vendor": {
+          "value": 4163
+        },
+        "device": {
+          "value": 31438
+        },
+        "sub_device": {
+          "value": 34452
+        },
+        "revision": {
+          "value": 17
+        },
+        "model": "Intel Serial bus controller",
+        "sysfs_id": "/devices/pci0000:00/0000:00:15.2",
+        "sysfs_bus_id": "0000:00:15.2",
+        "resources": [
+          {
+            "type": "irq",
+            "base": 29,
+            "triggered": 0,
+            "enabled": true
+          },
+          {
+            "type": "mem",
+            "base": 275150544896,
+            "range": 4096,
+            "enabled": true,
+            "access": "read_write",
+            "prefetch": "no"
+          }
+        ],
+        "detail": {
+          "function": 2,
+          "command": 6,
+          "header_type": 0,
+          "secondary_bus": 0,
+          "irq": 29,
+          "prog_if": 0
+        },
+        "driver": "intel-lpss",
+        "driver_module": "intel_lpss_pci",
+        "drivers": [
+          "intel-lpss"
+        ],
+        "driver_modules": [
+          "intel_lpss_pci"
+        ],
+        "module_alias": "pci:v00008086d00007ACEsv00001043sd00008694bc0Csc80i00",
+        "label": "Onboard - Other"
+      },
+      {
+        "index": 46,
+        "attached_to": 0,
+        "class_list": [
+          "pci",
+          "unknown"
+        ],
+        "bus_type": {
+          "name": "PCI",
+          "value": 4
+        },
+        "slot": {
+          "bus": 0,
+          "number": 21
+        },
+        "base_class": {
+          "name": "Serial bus controller",
+          "value": 12
+        },
+        "sub_class": {
+          "value": 128
+        },
+        "vendor": {
+          "name": "Intel Corporation",
+          "value": 32902
+        },
+        "sub_vendor": {
+          "value": 4163
+        },
+        "device": {
+          "value": 31436
+        },
+        "sub_device": {
+          "value": 34452
+        },
+        "revision": {
+          "value": 17
+        },
+        "model": "Intel Serial bus controller",
+        "sysfs_id": "/devices/pci0000:00/0000:00:15.0",
+        "sysfs_bus_id": "0000:00:15.0",
+        "resources": [
+          {
+            "type": "irq",
+            "base": 27,
+            "triggered": 0,
+            "enabled": true
+          },
+          {
+            "type": "mem",
+            "base": 275150536704,
+            "range": 4096,
+            "enabled": true,
+            "access": "read_write",
+            "prefetch": "no"
+          }
+        ],
+        "detail": {
+          "function": 0,
+          "command": 6,
+          "header_type": 0,
+          "secondary_bus": 0,
+          "irq": 27,
+          "prog_if": 0
+        },
+        "driver": "intel-lpss",
+        "driver_module": "intel_lpss_pci",
+        "drivers": [
+          "intel-lpss"
+        ],
+        "driver_modules": [
+          "intel_lpss_pci"
+        ],
+        "module_alias": "pci:v00008086d00007ACCsv00001043sd00008694bc0Csc80i00",
+        "label": "Onboard - Other"
+      },
+      {
+        "index": 52,
+        "attached_to": 0,
+        "class_list": [
+          "pci",
+          "unknown"
+        ],
+        "bus_type": {
+          "name": "PCI",
+          "value": 4
+        },
+        "slot": {
+          "bus": 0,
+          "number": 20
+        },
+        "base_class": {
+          "name": "Memory controller",
+          "value": 5
+        },
+        "sub_class": {
+          "name": "RAM memory",
+          "value": 0
+        },
+        "vendor": {
+          "name": "Intel Corporation",
+          "value": 32902
+        },
+        "sub_vendor": {
+          "value": 4163
+        },
+        "device": {
+          "value": 31399
+        },
+        "sub_device": {
+          "value": 34452
+        },
+        "revision": {
+          "value": 17
+        },
+        "model": "Intel RAM memory",
+        "sysfs_id": "/devices/pci0000:00/0000:00:14.2",
+        "sysfs_bus_id": "0000:00:14.2",
+        "resources": [
+          {
+            "type": "mem",
+            "base": 451141566464,
+            "range": 16384,
+            "enabled": false,
+            "access": "read_write",
+            "prefetch": "no"
+          },
+          {
+            "type": "mem",
+            "base": 451141603328,
+            "range": 4096,
+            "enabled": false,
+            "access": "read_write",
+            "prefetch": "no"
+          }
+        ],
+        "detail": {
+          "function": 2,
+          "command": 0,
+          "header_type": 0,
+          "secondary_bus": 0,
+          "irq": 0,
+          "prog_if": 0
+        },
+        "module_alias": "pci:v00008086d00007AA7sv00001043sd00008694bc05sc00i00",
+        "label": "Onboard - Other"
+      },
+      {
+        "index": 55,
+        "attached_to": 0,
+        "class_list": [
+          "pci",
+          "unknown"
+        ],
+        "bus_type": {
+          "name": "PCI",
+          "value": 4
+        },
+        "slot": {
+          "bus": 0,
+          "number": 31
+        },
+        "base_class": {
+          "name": "Serial bus controller",
+          "value": 12
+        },
+        "sub_class": {
+          "name": "SMBus",
+          "value": 5
+        },
+        "vendor": {
+          "name": "Intel Corporation",
+          "value": 32902
+        },
+        "sub_vendor": {
+          "value": 4163
+        },
+        "device": {
+          "value": 31395
+        },
+        "sub_device": {
+          "value": 34452
+        },
+        "revision": {
+          "value": 17
+        },
+        "model": "Intel SMBus",
+        "sysfs_id": "/devices/pci0000:00/0000:00:1f.4",
+        "sysfs_bus_id": "0000:00:1f.4",
+        "resources": [
+          {
+            "type": "io",
+            "base": 61344,
+            "range": 32,
+            "enabled": true,
+            "access": "read_write"
+          },
+          {
+            "type": "irq",
+            "base": 18,
+            "triggered": 0,
+            "enabled": true
+          },
+          {
+            "type": "mem",
+            "base": 451141582848,
+            "range": 256,
+            "enabled": true,
+            "access": "read_write",
+            "prefetch": "no"
+          }
+        ],
+        "detail": {
+          "function": 4,
+          "command": 3,
+          "header_type": 0,
+          "secondary_bus": 0,
+          "irq": 18,
+          "prog_if": 0
+        },
+        "driver": "i801_smbus",
+        "driver_module": "i2c_i801",
+        "drivers": [
+          "i801_smbus"
+        ],
+        "driver_modules": [
+          "i2c_i801"
+        ],
+        "module_alias": "pci:v00008086d00007AA3sv00001043sd00008694bc0Csc05i00",
+        "label": "Onboard - Other"
+      },
+      {
+        "index": 56,
+        "attached_to": 0,
+        "class_list": [
+          "pci",
+          "unknown"
+        ],
+        "bus_type": {
+          "name": "PCI",
+          "value": 4
+        },
+        "slot": {
+          "bus": 0,
+          "number": 10
+        },
+        "base_class": {
+          "name": "Signal processing controller",
+          "value": 17
+        },
+        "sub_class": {
+          "name": "Signal processing controller",
+          "value": 128
+        },
+        "vendor": {
+          "name": "Intel Corporation",
+          "value": 32902
+        },
+        "sub_vendor": {
+          "value": 4163
+        },
+        "device": {
+          "value": 18045
+        },
+        "sub_device": {
+          "value": 34452
+        },
+        "revision": {
+          "value": 1
+        },
+        "model": "Intel Signal processing controller",
+        "sysfs_id": "/devices/pci0000:00/0000:00:0a.0",
+        "sysfs_bus_id": "0000:00:0a.0",
+        "resources": [
+          {
+            "type": "mem",
+            "base": 451141500928,
+            "range": 32768,
+            "enabled": true,
+            "access": "read_write",
+            "prefetch": "no"
+          }
+        ],
+        "detail": {
+          "function": 0,
+          "command": 2,
+          "header_type": 0,
+          "secondary_bus": 0,
+          "irq": 0,
+          "prog_if": 0
+        },
+        "driver": "intel_vsec",
+        "driver_module": "intel_vsec",
+        "drivers": [
+          "intel_vsec"
+        ],
+        "driver_modules": [
+          "intel_vsec"
+        ],
+        "module_alias": "pci:v00008086d0000467Dsv00001043sd00008694bc11sc80i00",
+        "label": "Onboard - Other"
       }
     ],
     "sound": [
       {
         "index": 41,
         "attached_to": 0,
+        "class_list": [
+          "sound",
+          "pci"
+        ],
         "bus_type": {
           "name": "PCI",
           "value": 4
@@ -2944,7 +3754,7 @@
         "resources": [
           {
             "type": "irq",
-            "base": 180,
+            "base": 196,
             "triggered": 0,
             "enabled": true
           },
@@ -2970,7 +3780,7 @@
           "command": 1030,
           "header_type": 0,
           "secondary_bus": 0,
-          "irq": 180,
+          "irq": 196,
           "prog_if": 0
         },
         "driver": "snd_hda_intel",
@@ -2987,6 +3797,10 @@
       {
         "index": 51,
         "attached_to": 34,
+        "class_list": [
+          "sound",
+          "pci"
+        ],
         "bus_type": {
           "name": "PCI",
           "value": 4
@@ -3058,6 +3872,10 @@
       {
         "index": 65,
         "attached_to": 85,
+        "class_list": [
+          "sound",
+          "usb"
+        ],
         "bus_type": {
           "name": "USB",
           "value": 134
@@ -3148,6 +3966,10 @@
       {
         "index": 67,
         "attached_to": 70,
+        "class_list": [
+          "sound",
+          "usb"
+        ],
         "bus_type": {
           "name": "USB",
           "value": 134
@@ -3226,6 +4048,10 @@
       {
         "index": 68,
         "attached_to": 85,
+        "class_list": [
+          "sound",
+          "usb"
+        ],
         "bus_type": {
           "name": "USB",
           "value": 134
@@ -3316,6 +4142,10 @@
       {
         "index": 69,
         "attached_to": 70,
+        "class_list": [
+          "sound",
+          "usb"
+        ],
         "bus_type": {
           "name": "USB",
           "value": 134
@@ -3394,6 +4224,10 @@
       {
         "index": 71,
         "attached_to": 85,
+        "class_list": [
+          "sound",
+          "usb"
+        ],
         "bus_type": {
           "name": "USB",
           "value": 134
@@ -3484,6 +4318,10 @@
       {
         "index": 79,
         "attached_to": 85,
+        "class_list": [
+          "sound",
+          "usb"
+        ],
         "bus_type": {
           "name": "USB",
           "value": 134
@@ -3574,6 +4412,10 @@
       {
         "index": 81,
         "attached_to": 85,
+        "class_list": [
+          "sound",
+          "usb"
+        ],
         "bus_type": {
           "name": "USB",
           "value": 134
@@ -3664,6 +4506,10 @@
       {
         "index": 83,
         "attached_to": 70,
+        "class_list": [
+          "sound",
+          "usb"
+        ],
         "bus_type": {
           "name": "USB",
           "value": 134
@@ -3742,6 +4588,10 @@
       {
         "index": 84,
         "attached_to": 85,
+        "class_list": [
+          "sound",
+          "usb"
+        ],
         "bus_type": {
           "name": "USB",
           "value": 134
@@ -3832,6 +4682,10 @@
       {
         "index": 91,
         "attached_to": 85,
+        "class_list": [
+          "sound",
+          "usb"
+        ],
         "bus_type": {
           "name": "USB",
           "value": 134
@@ -3924,6 +4778,10 @@
       {
         "index": 28,
         "attached_to": 0,
+        "class_list": [
+          "storage_controller",
+          "pci"
+        ],
         "bus_type": {
           "name": "PCI",
           "value": 4
@@ -4036,6 +4894,10 @@
       {
         "index": 33,
         "attached_to": 47,
+        "class_list": [
+          "storage_controller",
+          "pci"
+        ],
         "bus_type": {
           "name": "PCI",
           "value": 4
@@ -4106,6 +4968,10 @@
       {
         "index": 48,
         "attached_to": 43,
+        "class_list": [
+          "storage_controller",
+          "pci"
+        ],
         "bus_type": {
           "name": "PCI",
           "value": 4
@@ -4214,6 +5080,10 @@
       {
         "index": 50,
         "attached_to": 0,
+        "class_list": [
+          "storage_controller",
+          "pci"
+        ],
         "bus_type": {
           "name": "PCI",
           "value": 4
@@ -4296,643 +5166,12 @@
       "form_factor": "laptop"
     },
     "unknown": [
-      {
-        "index": 30,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "PCI",
-          "value": 4
-        },
-        "slot": {
-          "bus": 0,
-          "number": 8
-        },
-        "base_class": {
-          "name": "Generic system peripheral",
-          "value": 8
-        },
-        "sub_class": {
-          "name": "System peripheral",
-          "value": 128
-        },
-        "vendor": {
-          "name": "Intel Corporation",
-          "value": 32902
-        },
-        "sub_vendor": {
-          "value": 4163
-        },
-        "device": {
-          "value": 17999
-        },
-        "sub_device": {
-          "value": 34452
-        },
-        "revision": {
-          "value": 2
-        },
-        "model": "Intel System peripheral",
-        "sysfs_id": "/devices/pci0000:00/0000:00:08.0",
-        "sysfs_bus_id": "0000:00:08.0",
-        "resources": [
-          {
-            "type": "irq",
-            "base": 255,
-            "triggered": 0,
-            "enabled": true
-          },
-          {
-            "type": "mem",
-            "base": 451141607424,
-            "range": 4096,
-            "enabled": false,
-            "access": "read_write",
-            "prefetch": "no"
-          }
-        ],
-        "detail": {
-          "function": 0,
-          "command": 0,
-          "header_type": 0,
-          "secondary_bus": 0,
-          "irq": 255,
-          "prog_if": 0
-        },
-        "module_alias": "pci:v00008086d0000464Fsv00001043sd00008694bc08sc80i00",
-        "label": "Onboard - Other"
-      },
-      {
-        "index": 31,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "PCI",
-          "value": 4
-        },
-        "slot": {
-          "bus": 0,
-          "number": 21
-        },
-        "base_class": {
-          "name": "Serial bus controller",
-          "value": 12
-        },
-        "sub_class": {
-          "value": 128
-        },
-        "vendor": {
-          "name": "Intel Corporation",
-          "value": 32902
-        },
-        "sub_vendor": {
-          "value": 4163
-        },
-        "device": {
-          "value": 31437
-        },
-        "sub_device": {
-          "value": 34452
-        },
-        "revision": {
-          "value": 17
-        },
-        "model": "Intel Serial bus controller",
-        "sysfs_id": "/devices/pci0000:00/0000:00:15.1",
-        "sysfs_bus_id": "0000:00:15.1",
-        "resources": [
-          {
-            "type": "irq",
-            "base": 40,
-            "triggered": 0,
-            "enabled": true
-          },
-          {
-            "type": "mem",
-            "base": 275150540800,
-            "range": 4096,
-            "enabled": true,
-            "access": "read_write",
-            "prefetch": "no"
-          }
-        ],
-        "detail": {
-          "function": 1,
-          "command": 6,
-          "header_type": 0,
-          "secondary_bus": 0,
-          "irq": 40,
-          "prog_if": 0
-        },
-        "driver": "intel-lpss",
-        "driver_module": "intel_lpss_pci",
-        "drivers": [
-          "intel-lpss"
-        ],
-        "driver_modules": [
-          "intel_lpss_pci"
-        ],
-        "module_alias": "pci:v00008086d00007ACDsv00001043sd00008694bc0Csc80i00",
-        "label": "Onboard - Other"
-      },
-      {
-        "index": 36,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "PCI",
-          "value": 4
-        },
-        "slot": {
-          "bus": 0,
-          "number": 22
-        },
-        "base_class": {
-          "name": "Communication controller",
-          "value": 7
-        },
-        "sub_class": {
-          "name": "Communication controller",
-          "value": 128
-        },
-        "vendor": {
-          "name": "Intel Corporation",
-          "value": 32902
-        },
-        "sub_vendor": {
-          "value": 4163
-        },
-        "device": {
-          "value": 31464
-        },
-        "sub_device": {
-          "value": 34452
-        },
-        "revision": {
-          "value": 17
-        },
-        "model": "Intel Communication controller",
-        "sysfs_id": "/devices/pci0000:00/0000:00:16.0",
-        "sysfs_bus_id": "0000:00:16.0",
-        "resources": [
-          {
-            "type": "irq",
-            "base": 174,
-            "triggered": 0,
-            "enabled": true
-          },
-          {
-            "type": "mem",
-            "base": 451141586944,
-            "range": 4096,
-            "enabled": true,
-            "access": "read_write",
-            "prefetch": "no"
-          }
-        ],
-        "detail": {
-          "function": 0,
-          "command": 1030,
-          "header_type": 0,
-          "secondary_bus": 0,
-          "irq": 174,
-          "prog_if": 0
-        },
-        "driver": "mei_me",
-        "driver_module": "mei_me",
-        "drivers": [
-          "mei_me"
-        ],
-        "driver_modules": [
-          "mei_me"
-        ],
-        "module_alias": "pci:v00008086d00007AE8sv00001043sd00008694bc07sc80i00",
-        "label": "Onboard - Other"
-      },
-      {
-        "index": 39,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "PCI",
-          "value": 4
-        },
-        "slot": {
-          "bus": 0,
-          "number": 31
-        },
-        "base_class": {
-          "name": "Serial bus controller",
-          "value": 12
-        },
-        "sub_class": {
-          "value": 128
-        },
-        "vendor": {
-          "name": "Intel Corporation",
-          "value": 32902
-        },
-        "sub_vendor": {
-          "value": 4163
-        },
-        "device": {
-          "value": 31396
-        },
-        "sub_device": {
-          "value": 34452
-        },
-        "revision": {
-          "value": 17
-        },
-        "model": "Intel Serial bus controller",
-        "sysfs_id": "/devices/pci0000:00/0000:00:1f.5",
-        "sysfs_bus_id": "0000:00:1f.5",
-        "resources": [
-          {
-            "type": "mem",
-            "base": 2155872256,
-            "range": 4096,
-            "enabled": true,
-            "access": "read_write",
-            "prefetch": "no"
-          }
-        ],
-        "detail": {
-          "function": 5,
-          "command": 1026,
-          "header_type": 0,
-          "secondary_bus": 0,
-          "irq": 0,
-          "prog_if": 0
-        },
-        "driver": "intel-spi",
-        "driver_module": "spi_intel_pci",
-        "drivers": [
-          "intel-spi"
-        ],
-        "driver_modules": [
-          "spi_intel_pci"
-        ],
-        "module_alias": "pci:v00008086d00007AA4sv00001043sd00008694bc0Csc80i00",
-        "label": "Onboard - Other"
-      },
-      {
-        "index": 44,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "PCI",
-          "value": 4
-        },
-        "slot": {
-          "bus": 0,
-          "number": 21
-        },
-        "base_class": {
-          "name": "Serial bus controller",
-          "value": 12
-        },
-        "sub_class": {
-          "value": 128
-        },
-        "vendor": {
-          "name": "Intel Corporation",
-          "value": 32902
-        },
-        "sub_vendor": {
-          "value": 4163
-        },
-        "device": {
-          "value": 31438
-        },
-        "sub_device": {
-          "value": 34452
-        },
-        "revision": {
-          "value": 17
-        },
-        "model": "Intel Serial bus controller",
-        "sysfs_id": "/devices/pci0000:00/0000:00:15.2",
-        "sysfs_bus_id": "0000:00:15.2",
-        "resources": [
-          {
-            "type": "irq",
-            "base": 29,
-            "triggered": 0,
-            "enabled": true
-          },
-          {
-            "type": "mem",
-            "base": 275150544896,
-            "range": 4096,
-            "enabled": true,
-            "access": "read_write",
-            "prefetch": "no"
-          }
-        ],
-        "detail": {
-          "function": 2,
-          "command": 6,
-          "header_type": 0,
-          "secondary_bus": 0,
-          "irq": 29,
-          "prog_if": 0
-        },
-        "driver": "intel-lpss",
-        "driver_module": "intel_lpss_pci",
-        "drivers": [
-          "intel-lpss"
-        ],
-        "driver_modules": [
-          "intel_lpss_pci"
-        ],
-        "module_alias": "pci:v00008086d00007ACEsv00001043sd00008694bc0Csc80i00",
-        "label": "Onboard - Other"
-      },
-      {
-        "index": 46,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "PCI",
-          "value": 4
-        },
-        "slot": {
-          "bus": 0,
-          "number": 21
-        },
-        "base_class": {
-          "name": "Serial bus controller",
-          "value": 12
-        },
-        "sub_class": {
-          "value": 128
-        },
-        "vendor": {
-          "name": "Intel Corporation",
-          "value": 32902
-        },
-        "sub_vendor": {
-          "value": 4163
-        },
-        "device": {
-          "value": 31436
-        },
-        "sub_device": {
-          "value": 34452
-        },
-        "revision": {
-          "value": 17
-        },
-        "model": "Intel Serial bus controller",
-        "sysfs_id": "/devices/pci0000:00/0000:00:15.0",
-        "sysfs_bus_id": "0000:00:15.0",
-        "resources": [
-          {
-            "type": "irq",
-            "base": 27,
-            "triggered": 0,
-            "enabled": true
-          },
-          {
-            "type": "mem",
-            "base": 275150536704,
-            "range": 4096,
-            "enabled": true,
-            "access": "read_write",
-            "prefetch": "no"
-          }
-        ],
-        "detail": {
-          "function": 0,
-          "command": 6,
-          "header_type": 0,
-          "secondary_bus": 0,
-          "irq": 27,
-          "prog_if": 0
-        },
-        "driver": "intel-lpss",
-        "driver_module": "intel_lpss_pci",
-        "drivers": [
-          "intel-lpss"
-        ],
-        "driver_modules": [
-          "intel_lpss_pci"
-        ],
-        "module_alias": "pci:v00008086d00007ACCsv00001043sd00008694bc0Csc80i00",
-        "label": "Onboard - Other"
-      },
-      {
-        "index": 52,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "PCI",
-          "value": 4
-        },
-        "slot": {
-          "bus": 0,
-          "number": 20
-        },
-        "base_class": {
-          "name": "Memory controller",
-          "value": 5
-        },
-        "sub_class": {
-          "name": "RAM memory",
-          "value": 0
-        },
-        "vendor": {
-          "name": "Intel Corporation",
-          "value": 32902
-        },
-        "sub_vendor": {
-          "value": 4163
-        },
-        "device": {
-          "value": 31399
-        },
-        "sub_device": {
-          "value": 34452
-        },
-        "revision": {
-          "value": 17
-        },
-        "model": "Intel RAM memory",
-        "sysfs_id": "/devices/pci0000:00/0000:00:14.2",
-        "sysfs_bus_id": "0000:00:14.2",
-        "resources": [
-          {
-            "type": "mem",
-            "base": 451141566464,
-            "range": 16384,
-            "enabled": false,
-            "access": "read_write",
-            "prefetch": "no"
-          },
-          {
-            "type": "mem",
-            "base": 451141603328,
-            "range": 4096,
-            "enabled": false,
-            "access": "read_write",
-            "prefetch": "no"
-          }
-        ],
-        "detail": {
-          "function": 2,
-          "command": 0,
-          "header_type": 0,
-          "secondary_bus": 0,
-          "irq": 0,
-          "prog_if": 0
-        },
-        "module_alias": "pci:v00008086d00007AA7sv00001043sd00008694bc05sc00i00",
-        "label": "Onboard - Other"
-      },
-      {
-        "index": 55,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "PCI",
-          "value": 4
-        },
-        "slot": {
-          "bus": 0,
-          "number": 31
-        },
-        "base_class": {
-          "name": "Serial bus controller",
-          "value": 12
-        },
-        "sub_class": {
-          "name": "SMBus",
-          "value": 5
-        },
-        "vendor": {
-          "name": "Intel Corporation",
-          "value": 32902
-        },
-        "sub_vendor": {
-          "value": 4163
-        },
-        "device": {
-          "value": 31395
-        },
-        "sub_device": {
-          "value": 34452
-        },
-        "revision": {
-          "value": 17
-        },
-        "model": "Intel SMBus",
-        "sysfs_id": "/devices/pci0000:00/0000:00:1f.4",
-        "sysfs_bus_id": "0000:00:1f.4",
-        "resources": [
-          {
-            "type": "io",
-            "base": 61344,
-            "range": 32,
-            "enabled": true,
-            "access": "read_write"
-          },
-          {
-            "type": "irq",
-            "base": 18,
-            "triggered": 0,
-            "enabled": true
-          },
-          {
-            "type": "mem",
-            "base": 451141582848,
-            "range": 256,
-            "enabled": true,
-            "access": "read_write",
-            "prefetch": "no"
-          }
-        ],
-        "detail": {
-          "function": 4,
-          "command": 3,
-          "header_type": 0,
-          "secondary_bus": 0,
-          "irq": 18,
-          "prog_if": 0
-        },
-        "driver": "i801_smbus",
-        "driver_module": "i2c_i801",
-        "drivers": [
-          "i801_smbus"
-        ],
-        "driver_modules": [
-          "i2c_i801"
-        ],
-        "module_alias": "pci:v00008086d00007AA3sv00001043sd00008694bc0Csc05i00",
-        "label": "Onboard - Other"
-      },
-      {
-        "index": 56,
-        "attached_to": 0,
-        "bus_type": {
-          "name": "PCI",
-          "value": 4
-        },
-        "slot": {
-          "bus": 0,
-          "number": 10
-        },
-        "base_class": {
-          "name": "Signal processing controller",
-          "value": 17
-        },
-        "sub_class": {
-          "name": "Signal processing controller",
-          "value": 128
-        },
-        "vendor": {
-          "name": "Intel Corporation",
-          "value": 32902
-        },
-        "sub_vendor": {
-          "value": 4163
-        },
-        "device": {
-          "value": 18045
-        },
-        "sub_device": {
-          "value": 34452
-        },
-        "revision": {
-          "value": 1
-        },
-        "model": "Intel Signal processing controller",
-        "sysfs_id": "/devices/pci0000:00/0000:00:0a.0",
-        "sysfs_bus_id": "0000:00:0a.0",
-        "resources": [
-          {
-            "type": "mem",
-            "base": 451141500928,
-            "range": 32768,
-            "enabled": true,
-            "access": "read_write",
-            "prefetch": "no"
-          }
-        ],
-        "detail": {
-          "function": 0,
-          "command": 2,
-          "header_type": 0,
-          "secondary_bus": 0,
-          "irq": 0,
-          "prog_if": 0
-        },
-        "driver": "intel_vsec",
-        "driver_module": "intel_vsec",
-        "drivers": [
-          "intel_vsec"
-        ],
-        "driver_modules": [
-          "intel_vsec"
-        ],
-        "module_alias": "pci:v00008086d0000467Dsv00001043sd00008694bc11sc80i00",
-        "label": "Onboard - Other"
-      },
       {
         "index": 60,
         "attached_to": 0,
+        "class_list": [
+          "unknown"
+        ],
         "base_class": {
           "name": "Communication controller",
           "value": 7
@@ -4964,15 +5203,21 @@
           },
           {
             "type": "irq",
-            "base": 0,
+            "base": 4,
             "triggered": 0,
             "enabled": true
           }
         ]
-      },
+      }
+    ],
+    "usb": [
       {
         "index": 72,
         "attached_to": 94,
+        "class_list": [
+          "usb",
+          "unknown"
+        ],
         "bus_type": {
           "name": "USB",
           "value": 134
@@ -5051,6 +5296,10 @@
       {
         "index": 74,
         "attached_to": 70,
+        "class_list": [
+          "usb",
+          "unknown"
+        ],
         "bus_type": {
           "name": "USB",
           "value": 134
@@ -5129,6 +5378,10 @@
       {
         "index": 76,
         "attached_to": 85,
+        "class_list": [
+          "usb",
+          "unknown"
+        ],
         "bus_type": {
           "name": "USB",
           "value": 134
@@ -5206,6 +5459,10 @@
       {
         "index": 77,
         "attached_to": 70,
+        "class_list": [
+          "usb",
+          "unknown"
+        ],
         "bus_type": {
           "name": "USB",
           "value": 134
@@ -5238,18 +5495,18 @@
         "model": "Swiftpoint Tracer",
         "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb1/1-10/1-10.3/1-10.3:1.1",
         "sysfs_bus_id": "1-10.3:1.1",
-        "unix_device_name": "/dev/input/event19",
+        "unix_device_name": "/dev/input/event18",
         "unix_device_number": {
           "type": 99,
           "major": 13,
-          "minor": 83,
+          "minor": 82,
           "range": 1
         },
         "unix_device_names": [
           "/dev/input/by-id/usb-Swiftpoint_Limited_Swiftpoint_Tracer_STJ910736-if01-event-kbd",
           "/dev/input/by-path/pci-0000:00:14.0-usb-0:10.3:1.1-event-kbd",
           "/dev/input/by-path/pci-0000:00:14.0-usbv2-0:10.3:1.1-event-kbd",
-          "/dev/input/event19"
+          "/dev/input/event18"
         ],
         "resources": [
           {
@@ -5297,6 +5554,10 @@
       {
         "index": 80,
         "attached_to": 70,
+        "class_list": [
+          "usb",
+          "unknown"
+        ],
         "bus_type": {
           "name": "USB",
           "value": 134
@@ -5337,6 +5598,9 @@
           "range": 1
         },
         "unix_device_names": [
+          "/dev/input/by-id/usb-Blue_Microphones_Yeti_Nano_2052SG007WZ8_888-000155040606-event-if03",
+          "/dev/input/by-path/pci-0000:00:14.0-usb-0:10.4:1.3-event",
+          "/dev/input/by-path/pci-0000:00:14.0-usbv2-0:10.4:1.3-event",
           "/dev/input/event21"
         ],
         "resources": [
@@ -5385,6 +5649,10 @@
       {
         "index": 82,
         "attached_to": 85,
+        "class_list": [
+          "usb",
+          "unknown"
+        ],
         "bus_type": {
           "name": "USB",
           "value": 134
@@ -5463,6 +5731,10 @@
       {
         "index": 87,
         "attached_to": 85,
+        "class_list": [
+          "usb",
+          "unknown"
+        ],
         "bus_type": {
           "name": "USB",
           "value": 134
@@ -5533,6 +5805,10 @@
       {
         "index": 88,
         "attached_to": 94,
+        "class_list": [
+          "usb",
+          "unknown"
+        ],
         "bus_type": {
           "name": "USB",
           "value": 134
@@ -5611,6 +5887,10 @@
       {
         "index": 89,
         "attached_to": 70,
+        "class_list": [
+          "usb",
+          "unknown"
+        ],
         "bus_type": {
           "name": "USB",
           "value": 134
@@ -5702,6 +5982,10 @@
       {
         "index": 90,
         "attached_to": 70,
+        "class_list": [
+          "usb",
+          "unknown"
+        ],
         "bus_type": {
           "name": "USB",
           "value": 134
@@ -5741,9 +6025,9 @@
           "range": 1
         },
         "unix_device_names": [
-          "/dev/input/by-id/usb-Razer_Razer_BlackWidow_Chroma-if01-event-kbd",
-          "/dev/input/by-path/pci-0000:00:14.0-usb-0:10.1:1.1-event-kbd",
-          "/dev/input/by-path/pci-0000:00:14.0-usbv2-0:10.1:1.1-event-kbd",
+          "/dev/input/by-id/usb-Razer_Razer_BlackWidow_Chroma-event-if01",
+          "/dev/input/by-path/pci-0000:00:14.0-usb-0:10.1:1.1-event",
+          "/dev/input/by-path/pci-0000:00:14.0-usbv2-0:10.1:1.1-event",
           "/dev/input/event15"
         ],
         "resources": [
@@ -5794,6 +6078,10 @@
       {
         "index": 54,
         "attached_to": 0,
+        "class_list": [
+          "usb_controller",
+          "pci"
+        ],
         "bus_type": {
           "name": "PCI",
           "value": 4
@@ -6259,20 +6547,22 @@
         ]
       }
     ],
-    "language": {
-      "handle": 120,
-      "languages": [
-        "en|US|iso8859-1",
-        "fr|FR|iso8859-1",
-        "zh|TW|unicode",
-        "zh|CN|unicode",
-        "ja|JP|unicode",
-        "de|DE|iso8859-1",
-        "es|ES|iso8859-1",
-        "ru|RU|iso8859-5",
-        "ko|KR|unicode"
-      ]
-    },
+    "language": [
+      {
+        "handle": 120,
+        "languages": [
+          "en|US|iso8859-1",
+          "fr|FR|iso8859-1",
+          "zh|TW|unicode",
+          "zh|CN|unicode",
+          "ja|JP|unicode",
+          "de|DE|iso8859-1",
+          "es|ES|iso8859-1",
+          "ru|RU|iso8859-5",
+          "ko|KR|unicode"
+        ]
+      }
+    ],
     "memory_array": [
       {
         "handle": 75,