diff --git a/device-types/Cisco/C9404R.yaml b/device-types/Cisco/C9404R.yaml
index 4b5d4572..fd477189 100644
--- a/device-types/Cisco/C9404R.yaml
+++ b/device-types/Cisco/C9404R.yaml
@@ -1,21 +1,36 @@
 ---
 manufacturer: Cisco
 model: Catalyst 9404R
-slug: cisco-c9404r
+slug: cisco-catalyst-9404r
 part_number: C9404R
+comments: '[Cisco Catalyst 9400 Series Chassis Data Sheet](https://www.cisco.com/c/en/us/products/collateral/switches/catalyst-9400-series-switches/nb-06-cat9400-ser-data-sheet-cte-en.html)'
 u_height: 6
-is_full_depth: false
-console-ports:
-  - name: con 0
-    type: rj-45
-power-ports:
-  - name: PS-1
-    type: iec-60320-c14
-    maximum_draw: 3200
-  - name: PS-2
-    type: iec-60320-c14
-    maximum_draw: 3200
-interfaces:
-  - name: GigabitEthernet0/0
-    type: 1000base-t
-    mgmt_only: true
+weight: 17.21
+weight_unit: kg
+is_full_depth: true
+airflow: right-to-left
+module-bays:
+  - name: Slot 1 Line-card
+    label: '1'
+    position: '1'
+  - name: Slot 2 Supervisor
+    label: '2'
+    position: '2'
+  - name: Slot 3 Supervisor
+    label: '3'
+    position: '3'
+  - name: Slot 4 Line-card
+    label: '4'
+    position: '4'
+  - name: Power Supply Module 1
+    label: PS1
+    position: '1'
+  - name: Power Supply Module 2
+    label: PS2
+    position: '2'
+  - name: Power Supply Module 3
+    label: PS3
+    position: '3'
+  - name: Power Supply Module 4
+    label: PS4
+    position: '4'
diff --git a/device-types/Cisco/C9407R.yaml b/device-types/Cisco/C9407R.yaml
index c96ba190..31a3a2e6 100644
--- a/device-types/Cisco/C9407R.yaml
+++ b/device-types/Cisco/C9407R.yaml
@@ -1,21 +1,57 @@
 ---
 manufacturer: Cisco
 model: Catalyst 9407R
-slug: cisco-c9407r
+slug: cisco-catalyst-9407r
 part_number: C9407R
+comments: '[Cisco Catalyst 9400 Series Chassis Data Sheet](https://www.cisco.com/c/en/us/products/collateral/switches/catalyst-9400-series-switches/nb-06-cat9400-ser-data-sheet-cte-en.html)'
 u_height: 10
-is_full_depth: false
-console-ports:
-  - name: con 0
-    type: rj-45
-power-ports:
-  - name: PS-1
-    type: iec-60320-c14
-    maximum_draw: 3200
-  - name: PS-2
-    type: iec-60320-c14
-    maximum_draw: 3200
-interfaces:
-  - name: GigabitEthernet0/0
-    type: 1000base-t
-    mgmt_only: true
+weight: 28.60
+weight_unit: kg
+is_full_depth: true
+airflow: right-to-left
+module-bays:
+  - name: Slot 1 Line-card
+    label: '1'
+    position: '1'
+  - name: Slot 2 Line-card
+    label: '2'
+    position: '2'
+  - name: Slot 3 Supervisor
+    label: '3'
+    position: '3'
+  - name: Slot 4 Supervisor
+    label: '4'
+    position: '4'
+  - name: Slot 5 Line-card
+    label: '5'
+    position: '5'
+  - name: Slot 6 Line-card
+    label: '6'
+    position: '6'
+  - name: Slot 7 Line-card
+    label: '7'
+    position: '7'
+  - name: Power Supply Module 1
+    label: PS1
+    position: '1'
+  - name: Power Supply Module 2
+    label: PS2
+    position: '2'
+  - name: Power Supply Module 3
+    label: PS3
+    position: '3'
+  - name: Power Supply Module 4
+    label: PS4
+    position: '4'
+  - name: Power Supply Module 5
+    label: PS5
+    position: '5'
+  - name: Power Supply Module 6
+    label: PS6
+    position: '6'
+  - name: Power Supply Module 7
+    label: PS7
+    position: '7'
+  - name: Power Supply Module 8
+    label: PS8
+    position: '8'
diff --git a/device-types/Cisco/C9410R.yaml b/device-types/Cisco/C9410R.yaml
index 69c65d75..eab544ab 100644
--- a/device-types/Cisco/C9410R.yaml
+++ b/device-types/Cisco/C9410R.yaml
@@ -1,21 +1,66 @@
 ---
 manufacturer: Cisco
 model: Catalyst 9410R
-slug: cisco-c9410r
+slug: cisco-catalyst-9410r
 part_number: C9410R
+comments: '[Cisco Catalyst 9400 Series Chassis Data Sheet](https://www.cisco.com/c/en/us/products/collateral/switches/catalyst-9400-series-switches/nb-06-cat9400-ser-data-sheet-cte-en.html)'
 u_height: 13
+weight: 29.51
+weight_unit: kg
 is_full_depth: true
-console-ports:
-  - name: con 0
-    type: rj-45
-power-ports:
-  - name: PS-1
-    type: iec-60320-c14
-    maximum_draw: 3190
-  - name: PS-2
-    type: iec-60320-c14
-    maximum_draw: 3190
-interfaces:
-  - name: GigabitEthernet0/0
-    type: 1000base-t
-    mgmt_only: true
+airflow: right-to-left
+module-bays:
+  - name: Slot 1 Line-card
+    label: '1'
+    position: '1'
+  - name: Slot 2 Line-card
+    label: '2'
+    position: '2'
+  - name: Slot 3 Line-card
+    label: '3'
+    position: '3'
+  - name: Slot 4 Line-card
+    label: '4'
+    position: '4'
+  - name: Slot 5 Supervisor
+    label: '5'
+    position: '5'
+  - name: Slot 6 Supervisor
+    label: '6'
+    position: '6'
+  - name: Slot 7 Line-card
+    label: '7'
+    position: '7'
+  - name: Slot 8 Line-card
+    label: '8'
+    position: '8'
+  - name: Slot 9 Line-card
+    label: '9'
+    position: '9'
+  - name: Slot 10 Line-card
+    label: '10'
+    position: '10'
+  - name: Power Supply Module 1
+    label: PS1
+    position: '1'
+  - name: Power Supply Module 2
+    label: PS2
+    position: '2'
+  - name: Power Supply Module 3
+    label: PS3
+    position: '3'
+  - name: Power Supply Module 4
+    label: PS4
+    position: '4'
+  - name: Power Supply Module 5
+    label: PS5
+    position: '5'
+  - name: Power Supply Module 6
+    label: PS6
+    position: '6'
+  - name: Power Supply Module 7
+    label: PS7
+    position: '7'
+  - name: Power Supply Module 8
+    label: PS8
+    position: '8'
diff --git a/module-types/Cisco/C9400-LC-24XS.yaml b/module-types/Cisco/C9400-LC-24XS.yaml
index 3074c9d8..933d1968 100644
--- a/module-types/Cisco/C9400-LC-24XS.yaml
+++ b/module-types/Cisco/C9400-LC-24XS.yaml
@@ -2,53 +2,53 @@
 manufacturer: Cisco
 part_number: C9400-LC-24XS
 model: C9400-LC-24XS
-comments: Cisco Catalyst 9400 Series 24-Port 10 Gigabit Ethernet (SFP+)
+comments: Cisco Catalyst 9400 Series 24-Port 10 Gigabit Ethernet (SFP+) <br> [Catalyst 9400 Series Data Sheets](https://www.cisco.com/c/en/us/products/collateral/switches/catalyst-9400-series-switches/nb-06-cat9400-series-line-data-sheet-cte-en.html)
 interfaces:
   - name: TenGigabitEthernet{module}/0/1
-    type: 10gbase-t
+    type: 10gbase-x-sfpp
   - name: TenGigabitEthernet{module}/0/2
-    type: 10gbase-t
+    type: 10gbase-x-sfpp
   - name: TenGigabitEthernet{module}/0/3
-    type: 10gbase-t
+    type: 10gbase-x-sfpp
   - name: TenGigabitEthernet{module}/0/4
-    type: 10gbase-t
+    type: 10gbase-x-sfpp
   - name: TenGigabitEthernet{module}/0/5
-    type: 10gbase-t
+    type: 10gbase-x-sfpp
   - name: TenGigabitEthernet{module}/0/6
-    type: 10gbase-t
+    type: 10gbase-x-sfpp
   - name: TenGigabitEthernet{module}/0/7
-    type: 10gbase-t
+    type: 10gbase-x-sfpp
   - name: TenGigabitEthernet{module}/0/8
-    type: 10gbase-t
+    type: 10gbase-x-sfpp
   - name: TenGigabitEthernet{module}/0/9
-    type: 10gbase-t
+    type: 10gbase-x-sfpp
   - name: TenGigabitEthernet{module}/0/10
-    type: 10gbase-t
+    type: 10gbase-x-sfpp
   - name: TenGigabitEthernet{module}/0/11
-    type: 10gbase-t
+    type: 10gbase-x-sfpp
   - name: TenGigabitEthernet{module}/0/12
-    type: 10gbase-t
+    type: 10gbase-x-sfpp
   - name: TenGigabitEthernet{module}/0/13
-    type: 10gbase-t
+    type: 10gbase-x-sfpp
   - name: TenGigabitEthernet{module}/0/14
-    type: 10gbase-t
+    type: 10gbase-x-sfpp
   - name: TenGigabitEthernet{module}/0/15
-    type: 10gbase-t
+    type: 10gbase-x-sfpp
   - name: TenGigabitEthernet{module}/0/16
-    type: 10gbase-t
+    type: 10gbase-x-sfpp
   - name: TenGigabitEthernet{module}/0/17
-    type: 10gbase-t
+    type: 10gbase-x-sfpp
   - name: TenGigabitEthernet{module}/0/18
-    type: 10gbase-t
+    type: 10gbase-x-sfpp
   - name: TenGigabitEthernet{module}/0/19
-    type: 10gbase-t
+    type: 10gbase-x-sfpp
   - name: TenGigabitEthernet{module}/0/20
-    type: 10gbase-t
+    type: 10gbase-x-sfpp
   - name: TenGigabitEthernet{module}/0/21
-    type: 10gbase-t
+    type: 10gbase-x-sfpp
   - name: TenGigabitEthernet{module}/0/22
-    type: 10gbase-t
+    type: 10gbase-x-sfpp
   - name: TenGigabitEthernet{module}/0/23
-    type: 10gbase-t
+    type: 10gbase-x-sfpp
   - name: TenGigabitEthernet{module}/0/24
-    type: 10gbase-t
+    type: 10gbase-x-sfpp
diff --git a/module-types/Cisco/C9400-LC-48U.yaml b/module-types/Cisco/C9400-LC-48U.yaml
index db90acf4..c4ec0243 100644
--- a/module-types/Cisco/C9400-LC-48U.yaml
+++ b/module-types/Cisco/C9400-LC-48U.yaml
@@ -2,7 +2,7 @@
 manufacturer: Cisco
 part_number: C9400-LC-48U
 model: C9400-LC-48U
-comments: Cisco Catalyst 9400 Series 48-Port UPOE 10/100/1000 (RJ-45)
+comments: Cisco Catalyst 9400 Series 48-Port UPOE 10/100/1000 (RJ-45) <br> [Catalyst 9400 Series Data Sheets](https://www.cisco.com/c/en/us/products/collateral/switches/catalyst-9400-series-switches/nb-06-cat9400-series-line-data-sheet-cte-en.html)
 interfaces:
   - name: GigabitEthernet{module}/0/1
     type: 1000base-t
diff --git a/module-types/Cisco/C9400-LC-48XS.yaml b/module-types/Cisco/C9400-LC-48XS.yaml
new file mode 100644
index 00000000..8f7c87a1
--- /dev/null
+++ b/module-types/Cisco/C9400-LC-48XS.yaml
@@ -0,0 +1,102 @@
+---
+manufacturer: Cisco
+part_number: C9400-LC-48XS
+model: C9400-LC-48XS
+comments: Cisco Catalyst 9400 Series 48-Port 10 Gigabit Ethernet (SFP+) <br> [Catalyst 9400 Series Data Sheets](https://www.cisco.com/c/en/us/products/collateral/switches/catalyst-9400-series-switches/nb-06-cat9400-series-line-data-sheet-cte-en.html)
+interfaces:
+  - name: TenGigabitEthernet{module}/0/1
+    type: 10gbase-x-sfpp
+  - name: TenGigabitEthernet{module}/0/2
+    type: 10gbase-x-sfpp
+  - name: TenGigabitEthernet{module}/0/3
+    type: 10gbase-x-sfpp
+  - name: TenGigabitEthernet{module}/0/4
+    type: 10gbase-x-sfpp
+  - name: TenGigabitEthernet{module}/0/5
+    type: 10gbase-x-sfpp
+  - name: TenGigabitEthernet{module}/0/6
+    type: 10gbase-x-sfpp
+  - name: TenGigabitEthernet{module}/0/7
+    type: 10gbase-x-sfpp
+  - name: TenGigabitEthernet{module}/0/8
+    type: 10gbase-x-sfpp
+  - name: TenGigabitEthernet{module}/0/9
+    type: 10gbase-x-sfpp
+  - name: TenGigabitEthernet{module}/0/10
+    type: 10gbase-x-sfpp
+  - name: TenGigabitEthernet{module}/0/11
+    type: 10gbase-x-sfpp
+  - name: TenGigabitEthernet{module}/0/12
+    type: 10gbase-x-sfpp
+  - name: TenGigabitEthernet{module}/0/13
+    type: 10gbase-x-sfpp
+  - name: TenGigabitEthernet{module}/0/14
+    type: 10gbase-x-sfpp
+  - name: TenGigabitEthernet{module}/0/15
+    type: 10gbase-x-sfpp
+  - name: TenGigabitEthernet{module}/0/16
+    type: 10gbase-x-sfpp
+  - name: TenGigabitEthernet{module}/0/17
+    type: 10gbase-x-sfpp
+  - name: TenGigabitEthernet{module}/0/18
+    type: 10gbase-x-sfpp
+  - name: TenGigabitEthernet{module}/0/19
+    type: 10gbase-x-sfpp
+  - name: TenGigabitEthernet{module}/0/20
+    type: 10gbase-x-sfpp
+  - name: TenGigabitEthernet{module}/0/21
+    type: 10gbase-x-sfpp
+  - name: TenGigabitEthernet{module}/0/22
+    type: 10gbase-x-sfpp
+  - name: TenGigabitEthernet{module}/0/23
+    type: 10gbase-x-sfpp
+  - name: TenGigabitEthernet{module}/0/24
+    type: 10gbase-x-sfpp
+  - name: TenGigabitEthernet{module}/0/25
+    type: 10gbase-x-sfpp
+  - name: TenGigabitEthernet{module}/0/26
+    type: 10gbase-x-sfpp
+  - name: TenGigabitEthernet{module}/0/27
+    type: 10gbase-x-sfpp
+  - name: TenGigabitEthernet{module}/0/28
+    type: 10gbase-x-sfpp
+  - name: TenGigabitEthernet{module}/0/29
+    type: 10gbase-x-sfpp
+  - name: TenGigabitEthernet{module}/0/30
+    type: 10gbase-x-sfpp
+  - name: TenGigabitEthernet{module}/0/31
+    type: 10gbase-x-sfpp
+  - name: TenGigabitEthernet{module}/0/32
+    type: 10gbase-x-sfpp
+  - name: TenGigabitEthernet{module}/0/33
+    type: 10gbase-x-sfpp
+  - name: TenGigabitEthernet{module}/0/34
+    type: 10gbase-x-sfpp
+  - name: TenGigabitEthernet{module}/0/35
+    type: 10gbase-x-sfpp
+  - name: TenGigabitEthernet{module}/0/36
+    type: 10gbase-x-sfpp
+  - name: TenGigabitEthernet{module}/0/37
+    type: 10gbase-x-sfpp
+  - name: TenGigabitEthernet{module}/0/38
+    type: 10gbase-x-sfpp
+  - name: TenGigabitEthernet{module}/0/39
+    type: 10gbase-x-sfpp
+  - name: TenGigabitEthernet{module}/0/40
+    type: 10gbase-x-sfpp
+  - name: TenGigabitEthernet{module}/0/41
+    type: 10gbase-x-sfpp
+  - name: TenGigabitEthernet{module}/0/42
+    type: 10gbase-x-sfpp
+  - name: TenGigabitEthernet{module}/0/43
+    type: 10gbase-x-sfpp
+  - name: TenGigabitEthernet{module}/0/44
+    type: 10gbase-x-sfpp
+  - name: TenGigabitEthernet{module}/0/45
+    type: 10gbase-x-sfpp
+  - name: TenGigabitEthernet{module}/0/46
+    type: 10gbase-x-sfpp
+  - name: TenGigabitEthernet{module}/0/47
+    type: 10gbase-x-sfpp
+  - name: TenGigabitEthernet{module}/0/48
+    type: 10gbase-x-sfpp
diff --git a/module-types/Cisco/C9400-PWR-2100AC.yaml b/module-types/Cisco/C9400-PWR-2100AC.yaml
new file mode 100644
index 00000000..a3efbd5f
--- /dev/null
+++ b/module-types/Cisco/C9400-PWR-2100AC.yaml
@@ -0,0 +1,9 @@
+---
+manufacturer: Cisco
+model: C9400-PWR-2100AC
+part_number: C9400-PWR-2100AC
+comments: Cisco Catalyst 9400 Series 2100W AC Power Supply <br> [Catalyst 9400 Series Data Sheets](https://www.cisco.com/c/en/us/products/collateral/switches/catalyst-9400-series-switches/nb-06-cat9400-series-line-data-sheet-cte-en.html)
+power-ports:
+  - name: PSU{module}
+    type: iec-60320-c20
+    maximum_draw: 2100
diff --git a/module-types/Cisco/C9400-PWR-3200AC.yaml b/module-types/Cisco/C9400-PWR-3200AC.yaml
new file mode 100644
index 00000000..c8d09efe
--- /dev/null
+++ b/module-types/Cisco/C9400-PWR-3200AC.yaml
@@ -0,0 +1,9 @@
+---
+manufacturer: Cisco
+model: C9400-PWR-3200AC
+part_number: C9400-PWR-3200AC
+comments: Cisco Catalyst 9400 Series 3200W AC Power Supply <br> [Catalyst 9400 Series Data Sheets](https://www.cisco.com/c/en/us/products/collateral/switches/catalyst-9400-series-switches/nb-06-cat9400-series-line-data-sheet-cte-en.html)
+power-ports:
+  - name: PSU{module}
+    type: iec-60320-c20
+    maximum_draw: 3200
diff --git a/module-types/Cisco/C9400-SUP-1XL-Y.yaml b/module-types/Cisco/C9400-SUP-1XL-Y.yaml
index 54d37581..8d50ec77 100644
--- a/module-types/Cisco/C9400-SUP-1XL-Y.yaml
+++ b/module-types/Cisco/C9400-SUP-1XL-Y.yaml
@@ -2,7 +2,12 @@
 manufacturer: Cisco
 part_number: C9400-SUP-1XL-Y
 model: C9400-SUP-1XL-Y
-comments: Cisco Catalyst 9400 Series Supervisor 1 XL Module with 25G
+comments: Cisco Catalyst 9400 Series Supervisor 1 XL Module with 25G <br> [C9400 Supervisor Data Sheet](https://www.cisco.com/c/en/us/products/collateral/switches/catalyst-9400-series-switches/nb-06-cat9400-ser-sup-eng-data-sheet-cte-en.html)
+console-ports:
+  - name: con 0
+    type: rj-45
+  - name: usb
+    type: usb-mini-b
 interfaces:
   - name: TenGigabitEthernet{module}/0/1
     type: 10gbase-x-sfpp
@@ -26,5 +31,8 @@ interfaces:
     type: 40gbase-x-qsfpp
   - name: TwentyFiveGigE{module}/0/1
     type: 25gbase-x-sfp28
-  - name: TwentyFiveGigE{module}/0/5
+  - name: TwentyFiveGigE{module}/0/2
     type: 25gbase-x-sfp28
+  - name: GigabitEthernet0/0
+    type: 1000base-t
+    mgmt_only: true