diff --git a/machines/sirius/facter.json b/machines/sirius/facter.json
index 2f1824c..5475c83 100644
--- a/machines/sirius/facter.json
+++ b/machines/sirius/facter.json
@@ -7,7 +7,10 @@
       {
         "index": 8,
         "attached_to": 0,
-        "class_list": ["pci", "bridge"],
+        "class_list": [
+          "pci",
+          "bridge"
+        ],
         "bus_type": {
           "hex": "0004",
           "name": "PCI",
@@ -57,8 +60,12 @@
         },
         "driver": "pcieport",
         "driver_module": "pcieportdrv",
-        "drivers": ["pcieport"],
-        "driver_modules": ["pcieportdrv"],
+        "drivers": [
+          "pcieport"
+        ],
+        "driver_modules": [
+          "pcieportdrv"
+        ],
         "module_alias": "pci:v000014E4d00002711sv00000000sd00000000bc06sc04i00"
       }
     ],
@@ -69,7 +76,13 @@
         "family": 0,
         "model": 3,
         "stepping": 0,
-        "features": ["fp", "asimd", "evtstrm", "crc32", "cpuid"],
+        "features": [
+          "fp",
+          "asimd",
+          "evtstrm",
+          "crc32",
+          "cpuid"
+        ],
         "bogo": 108,
         "page_size": 4096,
         "physical_id": 0,
@@ -86,86 +99,19 @@
       {
         "index": 16,
         "attached_to": 7,
-        "class_list": ["disk", "usb", "scsi", "block_device"],
+        "class_list": [
+          "disk",
+          "usb",
+          "scsi",
+          "block_device"
+        ],
         "bus_type": {
           "hex": "0084",
           "name": "SCSI",
           "value": 132
         },
         "slot": {
-          "bus": 1,
-          "number": 0
-        },
-        "base_class": {
-          "hex": "0106",
-          "name": "Mass Storage Device",
-          "value": 262
-        },
-        "sub_class": {
-          "hex": "0000",
-          "name": "Disk",
-          "value": 0
-        },
-        "vendor": {
-          "hex": "152d",
-          "value": 5421
-        },
-        "device": {
-          "hex": "0561",
-          "name": "0",
-          "value": 1377
-        },
-        "revision": {
-          "hex": "0000",
-          "name": "~",
-          "value": 0
-        },
-        "serial": "000000004EBF",
-        "model": "0",
-        "sysfs_id": "/class/block/sdb",
-        "sysfs_bus_id": "1:0:0:0",
-        "sysfs_device_link": "/devices/platform/scb/fd500000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0/usb2/2-1/2-1:1.0/host1/target1:0:0/1:0:0:0",
-        "unix_device_names": [
-          "/dev/disk/by-id/ata-ST20000NM002H-3KV133_ZYDBVV7Z",
-          "/dev/disk/by-id/usb-USB_3.0_Device_0_000000004EBF-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",
-          "/dev/sdb"
-        ],
-        "unix_device_name2": "/dev/sg1",
-        "resources": [
-          {
-            "type": "disk_geo",
-            "cylinders": 19074048,
-            "heads": 64,
-            "sectors": 32,
-            "size": "0x0",
-            "geo_type": "logical"
-          },
-          {
-            "type": "size",
-            "unit": "sectors",
-            "value_1": 39063650304,
-            "value_2": 512
-          }
-        ],
-        "driver": "uas",
-        "driver_module": "uas",
-        "drivers": ["sd", "uas"],
-        "driver_modules": ["uas"],
-        "module_alias": "usb:v152Dp0561dB9D1dc00dsc00dp00ic08isc06ip62in00"
-      },
-      {
-        "index": 17,
-        "attached_to": 7,
-        "class_list": ["disk", "usb", "scsi", "block_device"],
-        "bus_type": {
-          "hex": "0084",
-          "name": "SCSI",
-          "value": 132
-        },
-        "slot": {
-          "bus": 1,
+          "bus": 0,
           "number": 0
         },
         "base_class": {
@@ -194,17 +140,17 @@
         },
         "serial": "000000004EBF",
         "model": "1",
-        "sysfs_id": "/class/block/sdc",
-        "sysfs_bus_id": "1:0:0:1",
-        "sysfs_device_link": "/devices/platform/scb/fd500000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0/usb2/2-1/2-1:1.0/host1/target1:0:0/1:0:0:1",
+        "sysfs_id": "/class/block/sdb",
+        "sysfs_bus_id": "0:0:0:1",
+        "sysfs_device_link": "/devices/platform/scb/fd500000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0/usb2/2-1/2-1:1.0/host0/target0:0:0/0:0:0:1",
         "unix_device_names": [
           "/dev/disk/by-id/ata-ST20000NM002H-3KV133_ZYDBSJRE",
           "/dev/disk/by-id/usb-USB_3.0_Device_1_000000004EBF-0:1",
           "/dev/disk/by-path/platform-fd500000.pcie-pci-0000:01:00.0-usb-0:1:1.0-scsi-0:0:0:1",
           "/dev/disk/by-path/platform-fd500000.pcie-pci-0000:01:00.0-usbv3-0:1:1.0-scsi-0:0:0:1",
-          "/dev/sdc"
+          "/dev/sdb"
         ],
-        "unix_device_name2": "/dev/sg2",
+        "unix_device_name2": "/dev/sg1",
         "resources": [
           {
             "type": "disk_geo",
@@ -223,13 +169,104 @@
         ],
         "driver": "uas",
         "driver_module": "uas",
-        "drivers": ["sd", "uas"],
-        "driver_modules": ["uas"]
+        "drivers": [
+          "sd",
+          "uas"
+        ],
+        "driver_modules": [
+          "uas"
+        ],
+        "module_alias": "usb:v152Dp0561dB9D1dc00dsc00dp00ic08isc06ip62in00"
+      },
+      {
+        "index": 17,
+        "attached_to": 7,
+        "class_list": [
+          "disk",
+          "usb",
+          "scsi",
+          "block_device"
+        ],
+        "bus_type": {
+          "hex": "0084",
+          "name": "SCSI",
+          "value": 132
+        },
+        "slot": {
+          "bus": 1,
+          "number": 0
+        },
+        "base_class": {
+          "hex": "0106",
+          "name": "Mass Storage Device",
+          "value": 262
+        },
+        "sub_class": {
+          "hex": "0000",
+          "name": "Disk",
+          "value": 0
+        },
+        "vendor": {
+          "hex": "0781",
+          "name": "SanDisk",
+          "value": 1921
+        },
+        "device": {
+          "hex": "cfcb",
+          "name": "SDDR-B531",
+          "value": 53195
+        },
+        "revision": {
+          "hex": "0000",
+          "name": "2920",
+          "value": 0
+        },
+        "serial": "000000002920",
+        "model": "SanDisk SDDR-B531",
+        "sysfs_id": "/class/block/sdc",
+        "sysfs_bus_id": "1:0:0:0",
+        "sysfs_device_link": "/devices/platform/scb/fd500000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0/usb2/2-2/2-2:1.0/host1/target1:0:0/1:0:0:0",
+        "unix_device_names": [
+          "/dev/disk/by-id/usb-SanDisk_SDDR-B531_0525220000037317-0:0",
+          "/dev/disk/by-path/platform-fd500000.pcie-pci-0000:01:00.0-usb-0:2:1.0-scsi-0:0:0:0",
+          "/dev/disk/by-path/platform-fd500000.pcie-pci-0000:01:00.0-usbv3-0:2:1.0-scsi-0:0:0:0",
+          "/dev/sdc"
+        ],
+        "unix_device_name2": "/dev/sg2",
+        "resources": [
+          {
+            "type": "disk_geo",
+            "cylinders": 31166,
+            "heads": 255,
+            "sectors": 63,
+            "size": "0x0",
+            "geo_type": "logical"
+          },
+          {
+            "type": "size",
+            "unit": "sectors",
+            "value_1": 500695040,
+            "value_2": 512
+          }
+        ],
+        "driver": "usb-storage",
+        "driver_module": "usb_storage",
+        "drivers": [
+          "sd",
+          "usb-storage"
+        ],
+        "driver_modules": [
+          "usb_storage"
+        ],
+        "module_alias": "usb:v0781pCFCBd2920dc00dsc00dp00ic08isc06ip50in00"
       },
       {
         "index": 18,
         "attached_to": 14,
-        "class_list": ["disk", "block_device"],
+        "class_list": [
+          "disk",
+          "block_device"
+        ],
         "base_class": {
           "hex": "0106",
           "name": "Mass Storage Device",
@@ -267,12 +304,20 @@
           }
         ],
         "driver": "sdhci-iproc",
-        "drivers": ["mmcblk", "sdhci-iproc"]
+        "drivers": [
+          "mmcblk",
+          "sdhci-iproc"
+        ]
       },
       {
         "index": 19,
         "attached_to": 7,
-        "class_list": ["disk", "usb", "scsi", "block_device"],
+        "class_list": [
+          "disk",
+          "usb",
+          "scsi",
+          "block_device"
+        ],
         "bus_type": {
           "hex": "0084",
           "name": "SCSI",
@@ -293,68 +338,67 @@
           "value": 0
         },
         "vendor": {
-          "hex": "0781",
-          "name": "SanDisk",
-          "value": 1921
+          "hex": "152d",
+          "value": 5421
         },
         "device": {
-          "hex": "cfcb",
-          "name": "SDDR-B531",
-          "value": 53195
+          "hex": "0561",
+          "name": "0",
+          "value": 1377
         },
         "revision": {
           "hex": "0000",
-          "name": "2920",
+          "name": "~",
           "value": 0
         },
-        "serial": "000000002920",
-        "model": "SanDisk SDDR-B531",
+        "serial": "000000004EBF",
+        "model": "0",
         "sysfs_id": "/class/block/sda",
         "sysfs_bus_id": "0:0:0:0",
-        "sysfs_device_link": "/devices/platform/scb/fd500000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0/usb1/1-1/1-1.3/1-1.3:1.0/host0/target0:0:0/0:0:0:0",
+        "sysfs_device_link": "/devices/platform/scb/fd500000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0/usb2/2-1/2-1:1.0/host0/target0:0:0/0:0:0:0",
         "unix_device_names": [
-          "/dev/disk/by-id/usb-SanDisk_SDDR-B531_0525220000037317-0:0",
-          "/dev/disk/by-path/platform-fd500000.pcie-pci-0000:01:00.0-usb-0:1.3:1.0-scsi-0:0:0:0",
-          "/dev/disk/by-path/platform-fd500000.pcie-pci-0000:01:00.0-usbv2-0:1.3:1.0-scsi-0:0:0:0",
+          "/dev/disk/by-id/ata-ST20000NM002H-3KV133_ZYDBVV7Z",
+          "/dev/disk/by-id/usb-USB_3.0_Device_0_000000004EBF-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",
           "/dev/sda"
         ],
         "unix_device_name2": "/dev/sg0",
         "resources": [
-          {
-            "type": "baud",
-            "speed": 480000000,
-            "bits": 0,
-            "stop_bits": 0,
-            "parity": 0,
-            "handshake": 0
-          },
           {
             "type": "disk_geo",
-            "cylinders": 31166,
-            "heads": 255,
-            "sectors": 63,
+            "cylinders": 19074048,
+            "heads": 64,
+            "sectors": 32,
             "size": "0x0",
             "geo_type": "logical"
           },
           {
             "type": "size",
             "unit": "sectors",
-            "value_1": 500695040,
+            "value_1": 39063650304,
             "value_2": 512
           }
         ],
-        "driver": "usb-storage",
-        "driver_module": "usb_storage",
-        "drivers": ["sd", "usb-storage"],
-        "driver_modules": ["usb_storage"],
-        "module_alias": "usb:v0781pCFCBd2920dc00dsc00dp00ic08isc06ip50in00"
+        "driver": "uas",
+        "driver_module": "uas",
+        "drivers": [
+          "sd",
+          "uas"
+        ],
+        "driver_modules": [
+          "uas"
+        ]
       }
     ],
     "hub": [
       {
-        "index": 23,
+        "index": 24,
         "attached_to": 7,
-        "class_list": ["usb", "hub"],
+        "class_list": [
+          "usb",
+          "hub"
+        ],
         "bus_type": {
           "hex": "0086",
           "name": "USB",
@@ -427,14 +471,21 @@
         "hotplug": "usb",
         "driver": "hub",
         "driver_module": "usbcore",
-        "drivers": ["hub"],
-        "driver_modules": ["usbcore"],
+        "drivers": [
+          "hub"
+        ],
+        "driver_modules": [
+          "usbcore"
+        ],
         "module_alias": "usb:v1D6Bp0002d0612dc09dsc00dp01ic09isc00ip00in00"
       },
       {
         "index": 25,
-        "attached_to": 23,
-        "class_list": ["usb", "hub"],
+        "attached_to": 24,
+        "class_list": [
+          "usb",
+          "hub"
+        ],
         "bus_type": {
           "hex": "0086",
           "name": "USB",
@@ -505,14 +556,21 @@
         "hotplug": "usb",
         "driver": "hub",
         "driver_module": "usbcore",
-        "drivers": ["hub"],
-        "driver_modules": ["usbcore"],
+        "drivers": [
+          "hub"
+        ],
+        "driver_modules": [
+          "usbcore"
+        ],
         "module_alias": "usb:v2109p3431d0421dc09dsc00dp01ic09isc00ip00in00"
       },
       {
         "index": 26,
         "attached_to": 7,
-        "class_list": ["usb", "hub"],
+        "class_list": [
+          "usb",
+          "hub"
+        ],
         "bus_type": {
           "hex": "0086",
           "name": "USB",
@@ -575,8 +633,12 @@
         "hotplug": "usb",
         "driver": "hub",
         "driver_module": "usbcore",
-        "drivers": ["hub"],
-        "driver_modules": ["usbcore"],
+        "drivers": [
+          "hub"
+        ],
+        "driver_modules": [
+          "usbcore"
+        ],
         "module_alias": "usb:v1D6Bp0003d0612dc09dsc00dp03ic09isc00ip00in00"
       }
     ],
@@ -584,7 +646,10 @@
       {
         "index": 20,
         "attached_to": 25,
-        "class_list": ["keyboard", "usb"],
+        "class_list": [
+          "keyboard",
+          "usb"
+        ],
         "bus_type": {
           "hex": "0086",
           "name": "USB",
@@ -661,8 +726,12 @@
         "hotplug": "usb",
         "driver": "usbhid",
         "driver_module": "usbhid",
-        "drivers": ["usbhid"],
-        "driver_modules": ["usbhid"],
+        "drivers": [
+          "usbhid"
+        ],
+        "driver_modules": [
+          "usbhid"
+        ],
         "driver_info": {
           "type": "keyboard",
           "xkb_rules": "xfree86"
@@ -674,7 +743,9 @@
       {
         "index": 6,
         "attached_to": 0,
-        "class_list": ["memory"],
+        "class_list": [
+          "memory"
+        ],
         "base_class": {
           "hex": "0101",
           "name": "Internally Used Class",
@@ -698,7 +769,9 @@
       {
         "index": 14,
         "attached_to": 0,
-        "class_list": ["mmc_controller"],
+        "class_list": [
+          "mmc_controller"
+        ],
         "bus_type": {
           "hex": "0093",
           "name": "MMC",
@@ -719,12 +792,16 @@
         "sysfs_id": "/devices/platform/emmc2bus/fe340000.mmc/mmc_host/mmc1/mmc1:aaaa",
         "sysfs_bus_id": "mmc1:aaaa",
         "driver": "mmcblk",
-        "drivers": ["mmcblk"]
+        "drivers": [
+          "mmcblk"
+        ]
       },
       {
         "index": 15,
         "attached_to": 0,
-        "class_list": ["mmc_controller"],
+        "class_list": [
+          "mmc_controller"
+        ],
         "bus_type": {
           "hex": "0093",
           "name": "MMC",
@@ -748,9 +825,12 @@
     ],
     "mouse": [
       {
-        "index": 22,
+        "index": 23,
         "attached_to": 25,
-        "class_list": ["mouse", "usb"],
+        "class_list": [
+          "mouse",
+          "usb"
+        ],
         "bus_type": {
           "hex": "0086",
           "name": "USB",
@@ -829,11 +909,18 @@
         "hotplug": "usb",
         "driver": "usbhid",
         "driver_module": "usbhid",
-        "drivers": ["usbhid"],
-        "driver_modules": ["usbhid"],
+        "drivers": [
+          "usbhid"
+        ],
+        "driver_modules": [
+          "usbhid"
+        ],
         "driver_info": {
           "type": "mouse",
-          "db_entry_0": ["explorerps/2", "exps2"],
+          "db_entry_0": [
+            "explorerps/2",
+            "exps2"
+          ],
           "xf86": "explorerps/2",
           "gpm": "exps2",
           "buttons": -1,
@@ -846,7 +933,10 @@
       {
         "index": 10,
         "attached_to": 0,
-        "class_list": ["network_controller", "wlan_card"],
+        "class_list": [
+          "network_controller",
+          "wlan_card"
+        ],
         "bus_type": {
           "hex": "0094",
           "name": "SDIO",
@@ -879,11 +969,13 @@
         "model": "Broadcom BCM43438 combo WLAN and Bluetooth Low Energy (BLE)",
         "sysfs_id": "/devices/platform/soc/fe300000.mmc/mmc_host/mmc0/mmc0:0001/mmc0:0001:1",
         "sysfs_bus_id": "mmc0:0001:1",
-        "unix_device_names": ["wlan0"],
+        "unix_device_names": [
+          "wlan0"
+        ],
         "resources": [
           {
             "type": "hwaddr",
-            "address": 99
+            "address": 100
           },
           {
             "type": "phwaddr",
@@ -959,20 +1051,38 @@
               "5.72",
               "5.745"
             ],
-            "auth_modes": ["open", "sharedkey", "wpa-psk", "wpa-eap"],
-            "enc_modes": ["WEP40", "WEP104", "TKIP", "CCMP"]
+            "auth_modes": [
+              "open",
+              "sharedkey",
+              "wpa-psk",
+              "wpa-eap"
+            ],
+            "enc_modes": [
+              "WEP40",
+              "WEP104",
+              "TKIP",
+              "CCMP"
+            ]
           }
         ],
         "driver": "brcmfmac",
         "driver_module": "brcmfmac",
-        "drivers": ["brcmfmac"],
-        "driver_modules": ["brcmfmac", "brcmfmac", "brcmfmac"],
+        "drivers": [
+          "brcmfmac"
+        ],
+        "driver_modules": [
+          "brcmfmac",
+          "brcmfmac",
+          "brcmfmac"
+        ],
         "module_alias": "sdio:c00v02D0dA9A6"
       },
       {
         "index": 12,
         "attached_to": 0,
-        "class_list": ["network_controller"],
+        "class_list": [
+          "network_controller"
+        ],
         "base_class": {
           "hex": "0002",
           "name": "Network controller",
@@ -991,7 +1101,9 @@
         "model": "ARM Ethernet controller",
         "sysfs_id": "/devices/platform/scb/fd580000.ethernet",
         "sysfs_bus_id": "fd580000.ethernet",
-        "unix_device_names": ["end0"],
+        "unix_device_names": [
+          "end0"
+        ],
         "resources": [
           {
             "type": "hwaddr",
@@ -1004,8 +1116,12 @@
         ],
         "driver": "bcmgenet",
         "driver_module": "genet",
-        "drivers": ["bcmgenet"],
-        "driver_modules": ["genet"],
+        "drivers": [
+          "bcmgenet"
+        ],
+        "driver_modules": [
+          "genet"
+        ],
         "module_alias": "of:NethernetT(null)Cbrcm,bcm2711-genet-v5"
       }
     ],
@@ -1013,7 +1129,9 @@
       {
         "index": 27,
         "attached_to": 12,
-        "class_list": ["network_interface"],
+        "class_list": [
+          "network_interface"
+        ],
         "base_class": {
           "hex": "0107",
           "name": "Network Interface",
@@ -1027,7 +1145,9 @@
         "model": "Ethernet network interface",
         "sysfs_id": "/class/net/end0",
         "sysfs_device_link": "/devices/platform/scb/fd580000.ethernet",
-        "unix_device_names": ["end0"],
+        "unix_device_names": [
+          "end0"
+        ],
         "resources": [
           {
             "type": "hwaddr",
@@ -1040,13 +1160,19 @@
         ],
         "driver": "bcmgenet",
         "driver_module": "genet",
-        "drivers": ["bcmgenet"],
-        "driver_modules": ["genet"]
+        "drivers": [
+          "bcmgenet"
+        ],
+        "driver_modules": [
+          "genet"
+        ]
       },
       {
         "index": 28,
         "attached_to": 0,
-        "class_list": ["network_interface"],
+        "class_list": [
+          "network_interface"
+        ],
         "base_class": {
           "hex": "0107",
           "name": "Network Interface",
@@ -1059,12 +1185,16 @@
         },
         "model": "Loopback network interface",
         "sysfs_id": "/class/net/lo",
-        "unix_device_names": ["lo"]
+        "unix_device_names": [
+          "lo"
+        ]
       },
       {
         "index": 29,
         "attached_to": 10,
-        "class_list": ["network_interface"],
+        "class_list": [
+          "network_interface"
+        ],
         "base_class": {
           "hex": "0107",
           "name": "Network Interface",
@@ -1078,11 +1208,13 @@
         "model": "WLAN network interface",
         "sysfs_id": "/class/net/wlan0",
         "sysfs_device_link": "/devices/platform/soc/fe300000.mmc/mmc_host/mmc0/mmc0:0001/mmc0:0001:1",
-        "unix_device_names": ["wlan0"],
+        "unix_device_names": [
+          "wlan0"
+        ],
         "resources": [
           {
             "type": "hwaddr",
-            "address": 99
+            "address": 100
           },
           {
             "type": "phwaddr",
@@ -1091,8 +1223,14 @@
         ],
         "driver": "brcmfmac",
         "driver_module": "brcmfmac",
-        "drivers": ["brcmfmac"],
-        "driver_modules": ["brcmfmac", "brcmfmac", "brcmfmac"]
+        "drivers": [
+          "brcmfmac"
+        ],
+        "driver_modules": [
+          "brcmfmac",
+          "brcmfmac",
+          "brcmfmac"
+        ]
       }
     ],
     "system": {},
@@ -1100,7 +1238,9 @@
       {
         "index": 9,
         "attached_to": 0,
-        "class_list": ["unknown"],
+        "class_list": [
+          "unknown"
+        ],
         "bus_type": {
           "hex": "0094",
           "name": "SDIO",
@@ -1138,7 +1278,9 @@
       {
         "index": 11,
         "attached_to": 0,
-        "class_list": ["unknown"],
+        "class_list": [
+          "unknown"
+        ],
         "bus_type": {
           "hex": "0094",
           "name": "SDIO",
@@ -1173,8 +1315,14 @@
         "sysfs_bus_id": "mmc0:0001:2",
         "driver": "brcmfmac",
         "driver_module": "brcmfmac",
-        "drivers": ["brcmfmac"],
-        "driver_modules": ["brcmfmac", "brcmfmac", "brcmfmac"],
+        "drivers": [
+          "brcmfmac"
+        ],
+        "driver_modules": [
+          "brcmfmac",
+          "brcmfmac",
+          "brcmfmac"
+        ],
         "module_alias": "sdio:c00v02D0dA9A6"
       }
     ],
@@ -1182,7 +1330,10 @@
       {
         "index": 7,
         "attached_to": 8,
-        "class_list": ["usb_controller", "pci"],
+        "class_list": [
+          "usb_controller",
+          "pci"
+        ],
         "bus_type": {
           "hex": "0004",
           "name": "PCI",
@@ -1238,14 +1389,20 @@
         },
         "driver": "xhci_hcd",
         "driver_module": "xhci_pci",
-        "drivers": ["xhci_hcd"],
-        "driver_modules": ["xhci_pci"],
+        "drivers": [
+          "xhci_hcd"
+        ],
+        "driver_modules": [
+          "xhci_pci"
+        ],
         "module_alias": "pci:v00001106d00003483sv00001106sd00003483bc0Csc03i30"
       },
       {
         "index": 13,
         "attached_to": 0,
-        "class_list": ["usb_controller"],
+        "class_list": [
+          "usb_controller"
+        ],
         "base_class": {
           "hex": "000c",
           "name": "Serial bus controller",
@@ -1270,14 +1427,22 @@
         "sysfs_id": "/devices/platform/soc/fe980000.usb",
         "sysfs_bus_id": "fe980000.usb",
         "driver": "dwc2",
-        "drivers": ["dwc2"],
+        "drivers": [
+          "dwc2"
+        ],
         "driver_info": {
           "type": "module",
-          "db_entry_0": ["uhci-hcd"],
+          "db_entry_0": [
+            "uhci-hcd"
+          ],
           "active": false,
           "modprobe": true,
-          "names": ["uhci-hcd"],
-          "module_args": [""],
+          "names": [
+            "uhci-hcd"
+          ],
+          "module_args": [
+            ""
+          ],
           "conf": ""
         },
         "module_alias": "of:NusbT(null)Cbrcm,bcm2835-usb"