diff --git a/device-types/Cisco/C9200-24T.yaml b/device-types/Cisco/C9200-24T.yaml
index 611b21a2..bcf3991e 100644
--- a/device-types/Cisco/C9200-24T.yaml
+++ b/device-types/Cisco/C9200-24T.yaml
@@ -13,13 +13,6 @@ console-ports:
     type: rj-45
   - name: usb
     type: usb-mini-b
-power-ports:
-  - name: PS-1
-    type: iec-60320-c14
-    maximum_draw: 125
-  - name: PS-2
-    type: iec-60320-c14
-    maximum_draw: 125
 interfaces:
   - name: GigabitEthernet1/0/1
     type: 1000base-t
@@ -79,3 +72,7 @@ interfaces:
 module-bays:
   - name: Network Module
     position: '1'
+  - name: PS-0
+    position: PS-0
+  - name: PS-1
+    position: PS-1
diff --git a/device-types/Cisco/C9200-48P.yaml b/device-types/Cisco/C9200-48P.yaml
index 899d921b..d52dd249 100644
--- a/device-types/Cisco/C9200-48P.yaml
+++ b/device-types/Cisco/C9200-48P.yaml
@@ -12,13 +12,6 @@ console-ports:
     type: rj-45
   - name: usb
     type: usb-mini-b
-power-ports:
-  - name: PS-1
-    type: iec-60320-c14
-    maximum_draw: 740
-  - name: PS-2
-    type: iec-60320-c14
-    maximum_draw: 740
 interfaces:
   - name: GigabitEthernet1/0/1
     type: 1000base-t
@@ -222,3 +215,7 @@ module-bays:
     position: 1/1
   - name: StackPort1/2
     position: 1/2
+  - name: PS-0
+    position: PS-0
+  - name: PS-1
+    position: PS-1
diff --git a/device-types/Cisco/C9200-48T.yaml b/device-types/Cisco/C9200-48T.yaml
index 3a5976fc..4d0b6c06 100644
--- a/device-types/Cisco/C9200-48T.yaml
+++ b/device-types/Cisco/C9200-48T.yaml
@@ -11,13 +11,6 @@ console-ports:
     type: rj-45
   - name: usb
     type: usb-mini-b
-power-ports:
-  - name: PS-1
-    type: iec-60320-c14
-    maximum_draw: 125
-  - name: PS-2
-    type: iec-60320-c14
-    maximum_draw: 125
 interfaces:
   - name: GigabitEthernet1/0/1
     type: 1000base-t
@@ -125,3 +118,7 @@ interfaces:
 module-bays:
   - name: Network Module
     position: '1'
+  - name: PS-0
+    position: PS-0
+  - name: PS-1
+    position: PS-1
diff --git a/device-types/Cisco/C9200CX-12T-2X2G.yaml b/device-types/Cisco/C9200CX-12T-2X2G.yaml
index 94c83286..6f173ce9 100644
--- a/device-types/Cisco/C9200CX-12T-2X2G.yaml
+++ b/device-types/Cisco/C9200CX-12T-2X2G.yaml
@@ -11,6 +11,10 @@ console-ports:
     type: rj-45
   - name: usb
     type: usb-mini-b
+power-ports:
+  - name: PSU
+    type: dc-terminal
+    maximum_draw: 80
 interfaces:
   - name: GigabitEthernet1/0/1
     type: 1000base-t
diff --git a/device-types/Cisco/C9200L-24P-4G-E.yaml b/device-types/Cisco/C9200L-24P-4G-E.yaml
index d40817fb..508f1833 100644
--- a/device-types/Cisco/C9200L-24P-4G-E.yaml
+++ b/device-types/Cisco/C9200L-24P-4G-E.yaml
@@ -11,13 +11,11 @@ console-ports:
     type: rj-45
   - name: usb
     type: usb-mini-b
-power-ports:
+module-bays:
+  - name: PS-0
+    position: PS-0
   - name: PS-1
-    type: iec-60320-c14
-    maximum_draw: 600
-  - name: PS-2
-    type: iec-60320-c14
-    maximum_draw: 600
+    position: PS-1
 interfaces:
   - name: GigabitEthernet1/0/1
     type: 1000base-t
diff --git a/device-types/Cisco/C9200L-24T-4G.yaml b/device-types/Cisco/C9200L-24T-4G.yaml
index 541a86c2..4d3d4d48 100644
--- a/device-types/Cisco/C9200L-24T-4G.yaml
+++ b/device-types/Cisco/C9200L-24T-4G.yaml
@@ -11,13 +11,11 @@ console-ports:
     type: rj-45
   - name: usb
     type: usb-mini-b
-power-ports:
+module-bays:
+  - name: PS-0
+    position: PS-0
   - name: PS-1
-    type: iec-60320-c14
-    maximum_draw: 125
-  - name: PS-2
-    type: iec-60320-c14
-    maximum_draw: 125
+    position: PS-1
 interfaces:
   - name: GigabitEthernet1/0/1
     type: 1000base-t
diff --git a/device-types/Cisco/C9200L-24T-4X.yaml b/device-types/Cisco/C9200L-24T-4X.yaml
index 4f8e0817..586329b4 100644
--- a/device-types/Cisco/C9200L-24T-4X.yaml
+++ b/device-types/Cisco/C9200L-24T-4X.yaml
@@ -11,13 +11,11 @@ console-ports:
     type: rj-45
   - name: usb
     type: usb-mini-b
-power-ports:
+module-bays:
+  - name: PS-0
+    position: PS-0
   - name: PS-1
-    type: iec-60320-c14
-    maximum_draw: 125
-  - name: PS-2
-    type: iec-60320-c14
-    maximum_draw: 125
+    position: PS-1
 interfaces:
   - name: GigabitEthernet1/0/1
     type: 1000base-t
diff --git a/device-types/Cisco/C9200L-48P-4G-E.yaml b/device-types/Cisco/C9200L-48P-4G-E.yaml
index bf275336..8206d3d5 100644
--- a/device-types/Cisco/C9200L-48P-4G-E.yaml
+++ b/device-types/Cisco/C9200L-48P-4G-E.yaml
@@ -11,13 +11,11 @@ console-ports:
     type: rj-45
   - name: usb
     type: usb-mini-b
-power-ports:
+module-bays:
+  - name: PS-0
+    position: PS-0
   - name: PS-1
-    type: iec-60320-c14
-    maximum_draw: 1000
-  - name: PS-2
-    type: iec-60320-c14
-    maximum_draw: 1000
+    position: PS-1
 interfaces:
   - name: GigabitEthernet1/0/1
     type: 1000base-t
diff --git a/device-types/Cisco/C9200L-48PL-4G.yaml b/device-types/Cisco/C9200L-48PL-4G.yaml
index 28bca3ab..9320c72c 100644
--- a/device-types/Cisco/C9200L-48PL-4G.yaml
+++ b/device-types/Cisco/C9200L-48PL-4G.yaml
@@ -11,13 +11,11 @@ console-ports:
     type: rj-45
   - name: usb
     type: usb-mini-b
-power-ports:
+module-bays:
+  - name: PS-0
+    position: PS-0
   - name: PS-1
-    type: iec-60320-c14
-    maximum_draw: 600
-  - name: PS-2
-    type: iec-60320-c14
-    maximum_draw: 600
+    position: PS-1
 interfaces:
   - name: GigabitEthernet1/0/1
     type: 1000base-t
diff --git a/device-types/Cisco/C9200L-48T-4G.yaml b/device-types/Cisco/C9200L-48T-4G.yaml
index 1903ae48..35d18221 100644
--- a/device-types/Cisco/C9200L-48T-4G.yaml
+++ b/device-types/Cisco/C9200L-48T-4G.yaml
@@ -11,13 +11,11 @@ console-ports:
     type: rj-45
   - name: usb
     type: usb-mini-b
-power-ports:
+module-bays:
+  - name: PS-0
+    position: PS-0
   - name: PS-1
-    type: iec-60320-c14
-    maximum_draw: 125
-  - name: PS-2
-    type: iec-60320-c14
-    maximum_draw: 125
+    position: PS-1
 interfaces:
   - name: GigabitEthernet1/0/1
     type: 1000base-t
diff --git a/device-types/Cisco/C9200L-48T-4X.yaml b/device-types/Cisco/C9200L-48T-4X.yaml
index 71f0d7e3..ce72fc29 100644
--- a/device-types/Cisco/C9200L-48T-4X.yaml
+++ b/device-types/Cisco/C9200L-48T-4X.yaml
@@ -11,13 +11,11 @@ console-ports:
     type: rj-45
   - name: usb
     type: usb-mini-b
-power-ports:
+module-bays:
+  - name: PS-0
+    position: PS-0
   - name: PS-1
-    type: iec-60320-c14
-    maximum_draw: 125
-  - name: PS-2
-    type: iec-60320-c14
-    maximum_draw: 125
+    position: PS-1
 interfaces:
   - name: GigabitEthernet1/0/1
     type: 1000base-t
diff --git a/device-types/Cisco/C9500-16X.yaml b/device-types/Cisco/C9500-16X.yaml
index 7b972784..bf79e10b 100644
--- a/device-types/Cisco/C9500-16X.yaml
+++ b/device-types/Cisco/C9500-16X.yaml
@@ -5,19 +5,21 @@ slug: cisco-c9500-16x
 part_number: C9500-16X
 u_height: 1
 is_full_depth: true
+weight: 10.7
+weight_unit: kg
 comments: '[Cisco Catalyst 9500 Series Switches Data Sheet](https://www.cisco.com/c/en/us/products/collateral/switches/catalyst-9500-series-switches/nb-06-cat9500-ser-data-sheet-cte-en.html)'
 console-ports:
   - name: con 0
     type: rj-45
   - name: usb
     type: usb-mini-b
-power-ports:
+module-bays:
+  - name: PS-0
+    position: PS-0
   - name: PS-1
-    type: iec-60320-c14
-    maximum_draw: 850
-  - name: PS-2
-    type: iec-60320-c14
-    maximum_draw: 850
+    position: PS-1
+  - name: Network Module
+    position: '1'
 interfaces:
   - name: GigabitEthernet0/0
     type: 1000base-t
@@ -54,6 +56,3 @@ interfaces:
     type: 10gbase-x-sfpp
   - name: TenGigabitEthernet1/0/16
     type: 10gbase-x-sfpp
-module-bays:
-  - name: Network Module
-    position: '1'
diff --git a/device-types/Cisco/C9500-24Y4C.yaml b/device-types/Cisco/C9500-24Y4C.yaml
index dba25a6d..9ab932ec 100644
--- a/device-types/Cisco/C9500-24Y4C.yaml
+++ b/device-types/Cisco/C9500-24Y4C.yaml
@@ -5,19 +5,19 @@ slug: cisco-c9500-24y4c
 part_number: C9500-24Y4C
 u_height: 1
 is_full_depth: true
+weight: 9.52
+weight_unit: kg
 comments: '[Cisco Catalyst 9500 Series Switches Data Sheet](https://www.cisco.com/c/en/us/products/collateral/switches/catalyst-9500-series-switches/nb-06-cat9500-ser-data-sheet-cte-en.html)'
 console-ports:
   - name: con 0
     type: rj-45
   - name: usb
     type: usb-mini-b
-power-ports:
+module-bays:
   - name: PS-0
-    type: iec-60320-c14
-    maximum_draw: 650
+    position: PS-0
   - name: PS-1
-    type: iec-60320-c14
-    maximum_draw: 650
+    position: PS-1
 interfaces:
   - name: GigabitEthernet0/0
     type: 1000base-t
diff --git a/device-types/Cisco/C9500-32C.yaml b/device-types/Cisco/C9500-32C.yaml
index 4fd3ea0f..188b0f62 100644
--- a/device-types/Cisco/C9500-32C.yaml
+++ b/device-types/Cisco/C9500-32C.yaml
@@ -5,17 +5,19 @@ slug: cisco-c9500-32c
 part_number: C9500-32C
 u_height: 1
 is_full_depth: false
+weight: 11.63
+weight_unit: kg
 comments: '[Cisco Catalyst 9500 Series Switches Data Sheet](https://www.cisco.com/c/en/us/products/collateral/switches/catalyst-9500-series-switches/nb-06-cat9500-ser-data-sheet-cte-en.html)'
 console-ports:
   - name: con 0
     type: rj-45
   - name: usb
     type: usb-mini-b
-power-ports:
+module-bays:
   - name: PS-0
-    type: iec-60320-c14
+    position: PS-0
   - name: PS-1
-    type: iec-60320-c14
+    position: PS-1
 interfaces:
   - name: GigabitEthernet0/0
     type: 1000base-t
diff --git a/device-types/Cisco/C9500-32QC.yaml b/device-types/Cisco/C9500-32QC.yaml
index 08b18a6a..0f600a93 100644
--- a/device-types/Cisco/C9500-32QC.yaml
+++ b/device-types/Cisco/C9500-32QC.yaml
@@ -5,17 +5,14 @@ slug: cisco-c9500-32qc
 part_number: C9500-32QC
 u_height: 1
 is_full_depth: true
+weight: 9.91
+weight_unit: kg
 comments: '[Cisco Catalyst 9500 Series Switches Data Sheet](https://www.cisco.com/c/en/us/products/collateral/switches/catalyst-9500-series-switches/nb-06-cat9500-ser-data-sheet-cte-en.html)'
 console-ports:
   - name: con 0
     type: rj-45
   - name: usb
     type: usb-mini-b
-power-ports:
-  - name: PS-0
-    type: iec-60320-c14
-  - name: PS-1
-    type: iec-60320-c14
 interfaces:
   - name: GigabitEthernet0/0
     type: 1000base-t
@@ -116,3 +113,8 @@ interfaces:
     type: 100gbase-x-qsfp28
   - name: HundredGigE1/0/48
     type: 100gbase-x-qsfp28
+module-bays:
+  - name: PS-0
+    position: PS-0
+  - name: PS-1
+    position: PS-1
diff --git a/device-types/Cisco/C9500-40X.yaml b/device-types/Cisco/C9500-40X.yaml
index 041b6b15..2ef33926 100644
--- a/device-types/Cisco/C9500-40X.yaml
+++ b/device-types/Cisco/C9500-40X.yaml
@@ -5,19 +5,14 @@ slug: cisco-c9500-40x
 part_number: C9500-40X
 u_height: 1
 is_full_depth: true
+weight: 11.68
+weight_unit: kg
 comments: '[Cisco Catalyst 9500 Series Switches Data Sheet](https://www.cisco.com/c/en/us/products/collateral/switches/catalyst-9500-series-switches/nb-06-cat9500-ser-data-sheet-cte-en.html)'
 console-ports:
   - name: con 0
     type: rj-45
   - name: usb
     type: usb-mini-b
-power-ports:
-  - name: PS-1
-    type: iec-60320-c14
-    maximum_draw: 850
-  - name: PS-2
-    type: iec-60320-c14
-    maximum_draw: 850
 interfaces:
   - name: GigabitEthernet0/0
     type: 1000base-t
@@ -105,3 +100,7 @@ interfaces:
 module-bays:
   - name: Network Module
     position: '1'
+  - name: PS-0
+    position: PS-0
+  - name: PS-1
+    position: PS-1
diff --git a/device-types/Cisco/ISR2801.yaml b/device-types/Cisco/ISR2801.yaml
new file mode 100644
index 00000000..b67c3d1b
--- /dev/null
+++ b/device-types/Cisco/ISR2801.yaml
@@ -0,0 +1,59 @@
+---
+manufacturer: Cisco
+model: ISR2801
+part_number: ISR2801/K9
+slug: cisco-isr2801
+u_height: 1
+is_full_depth: false
+weight: 6.2
+weight_unit: kg
+comments: 'Datasheet: [Link](https://www.cisco.com/c/dam/global/de_at/assets/unified_partners/smb/vertriebliche-positionierung/routing/downloads/isr_2800_datenblatt_e.pdf)'
+interfaces:
+  - name: FastEthernet0/0
+    type: 100base-tx
+  - name: FastEthernet0/1
+    type: 100base-tx
+console-ports:
+  - name: con 0
+    type: rj-45
+  - name: aux
+    type: rj-45
+  - name: usb0
+    type: usb-mini-b
+module-bays:
+  - name: AIM slot 0
+    label: AIM 0
+    position: AIM0
+    description: Advanced Integration Module Slot
+  - name: AIM slot 1
+    label: AIM 1
+    position: AIM1
+    description: Advanced Integration Module Slot
+  - name: Slot 0 SubSlot 4
+    label: PVDM0
+    position: PVDM0
+    description: Packet Voice Digital Signal Processor Module Slot
+  - name: Slot 0 SubSlot 5
+    label: PVDM1
+    position: PVDM1
+    description: Packet Voice Digital Signal Processor Module Slot
+  - name: Slot 0/0
+    label: HWIC0
+    position: 0/0
+    description: High-Speed WAN Interface Card Slot
+  - name: Slot 0/1
+    label: HWIC1
+    position: 0/1
+    description: High-Speed WAN Interface Card Slot
+  - name: Slot 0/2
+    label: HWIC2
+    position: 0/2
+    description: High-Speed WAN Interface Card Slot
+  - name: Slot 0/3
+    label: HWIC3
+    position: 0/3
+    description: High-Speed WAN Interface Card Slot
+power-ports:
+  - name: PSU0
+    type: iec-60320-c6
+    maximum_draw: 120
diff --git a/device-types/Cisco/ISR2811.yaml b/device-types/Cisco/ISR2811.yaml
index 94ff681b..c10073db 100644
--- a/device-types/Cisco/ISR2811.yaml
+++ b/device-types/Cisco/ISR2811.yaml
@@ -5,6 +5,9 @@ part_number: ISR2811/K9
 slug: cisco-isr2811
 u_height: 1
 is_full_depth: false
+weight: 6.4
+weight_unit: kg
+comments: 'Datasheet: [Link](https://www.cisco.com/c/dam/global/de_at/assets/unified_partners/smb/vertriebliche-positionierung/routing/downloads/isr_2800_datenblatt_e.pdf)'
 interfaces:
   - name: FastEthernet0/0
     type: 100base-tx
@@ -17,8 +20,43 @@ console-ports:
     type: rj-45
   - name: usb0
     type: usb-mini-b
-  - name: usb1
-    type: usb-mini-b
+module-bays:
+  - name: AIM slot 0
+    label: AIM 0
+    position: AIM0
+    description: Advanced Integration Module Slot
+  - name: AIM slot 1
+    label: AIM 1
+    position: AIM1
+    description: Advanced Integration Module Slot
+  - name: Slot 0 SubSlot 4
+    label: PVDM0
+    position: PVDM0
+    description: Packet Voice Digital Signal Processor Module Slot
+  - name: Slot 0 SubSlot 5
+    label: PVDM1
+    position: PVDM1
+    description: Packet Voice Digital Signal Processor Module Slot
+  - name: Slot 0/0
+    label: HWIC0
+    position: 0/0
+    description: High-Speed WAN Interface Card Slot
+  - name: Slot 0/1
+    label: HWIC1
+    position: 0/1
+    description: High-Speed WAN Interface Card Slot
+  - name: Slot 0/2
+    label: HWIC2
+    position: 0/2
+    description: High-Speed WAN Interface Card Slot
+  - name: Slot 0/3
+    label: HWIC3
+    position: 0/3
+    description: High-Speed WAN Interface Card Slot
+  - name: Slot 1/0
+    label: '1'
+    position: 1/0
+    description: Single-wide / Extended single-wide Network Module Slot
 power-ports:
   - name: PSU0
     type: iec-60320-c6
diff --git a/device-types/Cisco/ISR2821.yaml b/device-types/Cisco/ISR2821.yaml
index 16691ad1..8e0d8663 100644
--- a/device-types/Cisco/ISR2821.yaml
+++ b/device-types/Cisco/ISR2821.yaml
@@ -4,7 +4,9 @@ model: ISR2821
 slug: cisco-isr2821
 part_number: CISCO2821
 u_height: 2
-is_full_depth: false
+is_full_depth: true
+weight: 11.4
+weight_unit: kg
 comments: 'Datasheet: [Link](https://www.cisco.com/c/dam/global/de_at/assets/unified_partners/smb/vertriebliche-positionierung/routing/downloads/isr_2800_datenblatt_e.pdf)'
 console-ports:
   - name: aux 0
@@ -16,6 +18,8 @@ console-ports:
 power-ports:
   - name: PS1
     type: iec-60320-c14
+    allocated_draw: 120
+    maximum_draw: 240
 interfaces:
   - name: GigabitEthernet0/0
     type: 1000base-t
@@ -40,6 +44,10 @@ module-bays:
     label: PVDM1
     position: PVDM1
     description: Packet Voice Digital Signal Processor Module Slot
+  - name: Slot 0 SubSlot 6
+    label: PVDM2
+    position: PVDM2
+    description: Packet Voice Digital Signal Processor Module Slot
   - name: Slot 0/0
     label: HWIC0
     position: 0/0
@@ -60,7 +68,3 @@ module-bays:
     label: '1'
     position: 1/0
     description: Single-wide / Extended single-wide Network Module Slot
-  - name: Slot 2/0
-    label: '2'
-    position: 2/0
-    description: Network Module Slot
diff --git a/device-types/Cisco/ISR2851.yaml b/device-types/Cisco/ISR2851.yaml
new file mode 100644
index 00000000..9dde01cd
--- /dev/null
+++ b/device-types/Cisco/ISR2851.yaml
@@ -0,0 +1,70 @@
+---
+manufacturer: Cisco
+model: ISR2851
+slug: cisco-isr2851
+part_number: CISCO2851
+u_height: 2
+is_full_depth: true
+weight: 11.4
+weight_unit: kg
+comments: 'Datasheet: [Link](https://www.cisco.com/c/dam/global/de_at/assets/unified_partners/smb/vertriebliche-positionierung/routing/downloads/isr_2800_datenblatt_e.pdf)'
+console-ports:
+  - name: aux 0
+    type: rj-45
+    label: AUX
+  - name: con 0
+    type: rj-45
+    label: CONSOLE
+power-ports:
+  - name: PS1
+    type: iec-60320-c14
+    allocated_draw: 180
+    maximum_draw: 360
+interfaces:
+  - name: GigabitEthernet0/0
+    type: 1000base-t
+    label: GE 0/0
+  - name: GigabitEthernet0/1
+    type: 1000base-t
+    label: GE 0/1
+module-bays:
+  - name: AIM slot 0
+    label: AIM 0
+    position: AIM0
+    description: Advanced Integration Module Slot
+  - name: AIM slot 1
+    label: AIM 1
+    position: AIM1
+    description: Advanced Integration Module Slot
+  - name: Slot 0 SubSlot 4
+    label: PVDM0
+    position: PVDM0
+    description: Packet Voice Digital Signal Processor Module Slot
+  - name: Slot 0 SubSlot 5
+    label: PVDM1
+    position: PVDM1
+    description: Packet Voice Digital Signal Processor Module Slot
+  - name: Slot 0 SubSlot 6
+    label: PVDM2
+    position: PVDM2
+    description: Packet Voice Digital Signal Processor Module Slot
+  - name: Slot 0/0
+    label: HWIC0
+    position: 0/0
+    description: High-Speed WAN Interface Card Slot
+  - name: Slot 0/1
+    label: HWIC1
+    position: 0/1
+    description: High-Speed WAN Interface Card Slot
+  - name: Slot 0/2
+    label: HWIC2
+    position: 0/2
+    description: High-Speed WAN Interface Card Slot
+  - name: Slot 0/3
+    label: HWIC3
+    position: 0/3
+    description: High-Speed WAN Interface Card Slot
+  - name: Slot 1/0
+    label: '1'
+    position: 1/0
+    description: Single-wide / Extended single-wide Network Module Slot
diff --git a/device-types/Cisco/WS-C2950-24.yaml b/device-types/Cisco/WS-C2950-24.yaml
index ebf9401f..57b87a51 100644
--- a/device-types/Cisco/WS-C2950-24.yaml
+++ b/device-types/Cisco/WS-C2950-24.yaml
@@ -4,6 +4,8 @@ model: WS-C2950-24
 part_number: WS-C2950-24
 slug: cisco-ws-c2950-24
 u_height: 1
+weight: 3
+weight_unit: kg
 is_full_depth: false
 console-ports:
   - name: con 0
diff --git a/device-types/Cisco/WS-C2950T-48-SI.yaml b/device-types/Cisco/WS-C2950T-48-SI.yaml
index 7ce826db..fcdda813 100644
--- a/device-types/Cisco/WS-C2950T-48-SI.yaml
+++ b/device-types/Cisco/WS-C2950T-48-SI.yaml
@@ -5,6 +5,8 @@ slug: cisco-ws-c2950t-48-si
 part_number: WS-C2950T-48-SI
 is_full_depth: false
 u_height: 1
+weight: 4.8
+weight_unit: kg
 interfaces:
   - name: FastEthernet0/1
     type: 100base-tx
diff --git a/device-types/Generic/Blanking-Panel-4U.yaml b/device-types/Generic/Blanking-Panel-4U.yaml
new file mode 100644
index 00000000..a80b38e1
--- /dev/null
+++ b/device-types/Generic/Blanking-Panel-4U.yaml
@@ -0,0 +1,7 @@
+---
+manufacturer: Generic
+model: Blanking Panel 4U
+slug: generic-blanking-panel-4u
+is_powered: false
+u_height: 4.0
+is_full_depth: false
diff --git a/device-types/Huawei/S5320-28P-LI-AC.yaml b/device-types/Huawei/S5320-28P-LI-AC.yaml
new file mode 100644
index 00000000..3bb599d4
--- /dev/null
+++ b/device-types/Huawei/S5320-28P-LI-AC.yaml
@@ -0,0 +1,75 @@
+---
+manufacturer: Huawei
+model: S5320-28P-LI-AC
+slug: huawei-s5320-28p-li-ac
+u_height: 1.0
+weight: 4.3
+weight_unit: kg
+is_full_depth: false
+airflow: left-to-right
+comments: S5320-28P-LI-AC (24*10/100/1000BASE-T ports, 4*1000BASE-X SFP ports, with integrated power module)
+console-ports:
+  - name: console0
+    type: rj-45
+power-ports:
+  - name: PWR1
+    type: iec-60320-c14
+    maximum_draw: 22
+    allocated_draw: 18
+interfaces:
+  - name: GigabitEthernet0/0/1
+    type: 1000base-t
+  - name: GigabitEthernet0/0/2
+    type: 1000base-t
+  - name: GigabitEthernet0/0/3
+    type: 1000base-t
+  - name: GigabitEthernet0/0/4
+    type: 1000base-t
+  - name: GigabitEthernet0/0/5
+    type: 1000base-t
+  - name: GigabitEthernet0/0/6
+    type: 1000base-t
+  - name: GigabitEthernet0/0/7
+    type: 1000base-t
+  - name: GigabitEthernet0/0/8
+    type: 1000base-t
+  - name: GigabitEthernet0/0/9
+    type: 1000base-t
+  - name: GigabitEthernet0/0/10
+    type: 1000base-t
+  - name: GigabitEthernet0/0/11
+    type: 1000base-t
+  - name: GigabitEthernet0/0/12
+    type: 1000base-t
+  - name: GigabitEthernet0/0/13
+    type: 1000base-t
+  - name: GigabitEthernet0/0/14
+    type: 1000base-t
+  - name: GigabitEthernet0/0/15
+    type: 1000base-t
+  - name: GigabitEthernet0/0/16
+    type: 1000base-t
+  - name: GigabitEthernet0/0/17
+    type: 1000base-t
+  - name: GigabitEthernet0/0/18
+    type: 1000base-t
+  - name: GigabitEthernet0/0/19
+    type: 1000base-t
+  - name: GigabitEthernet0/0/20
+    type: 1000base-t
+  - name: GigabitEthernet0/0/21
+    type: 1000base-t
+  - name: GigabitEthernet0/0/22
+    type: 1000base-t
+  - name: GigabitEthernet0/0/23
+    type: 1000base-t
+  - name: GigabitEthernet0/0/24
+    type: 1000base-t
+  - name: GigabitEthernet0/0/25
+    type: 1000base-x-sfp
+  - name: GigabitEthernet0/0/26
+    type: 1000base-x-sfp
+  - name: GigabitEthernet0/0/27
+    type: 1000base-x-sfp
+  - name: GigabitEthernet0/0/28
+    type: 1000base-x-sfp
diff --git a/device-types/Huawei/S5720-12TP-LI-AC.yaml b/device-types/Huawei/S5720-12TP-LI-AC.yaml
new file mode 100644
index 00000000..65156391
--- /dev/null
+++ b/device-types/Huawei/S5720-12TP-LI-AC.yaml
@@ -0,0 +1,43 @@
+---
+manufacturer: Huawei
+model: S5720-12TP-LI-AC
+slug: huawei-s5720-12tp-li-ac
+is_full_depth: false
+u_height: 1
+airflow: passive
+weight: 1.8
+weight_unit: kg
+comments: '[S5720-12TP-LI-AC](https://support.huawei.com/enterprise/en/doc/EDOC1000013597/b4dabfc4/s5720-12tp-li-ac)'
+console-ports:
+  - name: Console
+    label: RJ-45 Console
+    type: rj-45
+interfaces:
+  - name: GigabitEthernet0/0/1
+    type: 1000base-t
+  - name: GigabitEthernet0/0/2
+    type: 1000base-t
+  - name: GigabitEthernet0/0/3
+    type: 1000base-t
+  - name: GigabitEthernet0/0/4
+    type: 1000base-t
+  - name: GigabitEthernet0/0/5
+    type: 1000base-t
+  - name: GigabitEthernet0/0/6
+    type: 1000base-t
+  - name: GigabitEthernet0/0/7
+    type: 1000base-t
+  - name: GigabitEthernet0/0/8
+    type: 1000base-t
+  - name: GigabitEthernet0/0/9
+    type: 1000base-t
+  - name: GigabitEthernet0/0/10
+    type: 1000base-t
+  - name: GigabitEthernet0/0/11
+    type: 1000base-x-sfp
+  - name: GigabitEthernet0/0/12
+    type: 1000base-x-sfp
+power-ports:
+  - name: PSU1
+    type: iec-60320-c14
+    maximum_draw: 13
diff --git a/device-types/MikroTik/RB951Ui-2HnD.yaml b/device-types/MikroTik/RB951Ui-2HnD.yaml
new file mode 100644
index 00000000..07a34503
--- /dev/null
+++ b/device-types/MikroTik/RB951Ui-2HnD.yaml
@@ -0,0 +1,39 @@
+---
+manufacturer: MikroTik
+model: RB951Ui-2HnD
+slug: mikrotik-rb951ui-2hnd
+part_number: RB951Ui-2HnD
+u_height: 0
+weight: 0.3
+weight_unit: kg
+is_full_depth: false
+airflow: passive
+comments: '[RB951Ui-2HnD Datasheet](https://mikrotik.com/product/RB951Ui-2HnD)'
+power-ports:
+  - name: Power
+    type: dc-terminal
+    maximum_draw: 24
+    allocated_draw: 7
+    description: DC 8-30 V - 500 mA
+console-ports:
+  - name: USB
+    type: usb-a
+interfaces:
+  - name: Ether1
+    type: 100base-tx
+    poe_mode: pd
+    poe_type: passive-24v-2pair
+    description: POE-IN
+  - name: Ether2
+    type: 100base-tx
+  - name: Ether3
+    type: 100base-tx
+  - name: Ether4
+    type: 100base-tx
+  - name: Ether5
+    type: 100base-tx
+    poe_mode: pse
+    poe_type: passive-24v-2pair
+    description: POE-OUT
+  - name: Wireless 2.4 GHz
+    type: ieee802.11g
diff --git a/device-types/MikroTik/RB951Ui-2nD.yaml b/device-types/MikroTik/RB951Ui-2nD.yaml
index 84521bb6..4832a5bc 100644
--- a/device-types/MikroTik/RB951Ui-2nD.yaml
+++ b/device-types/MikroTik/RB951Ui-2nD.yaml
@@ -32,7 +32,7 @@ interfaces:
     type: 100base-tx
   - name: Ether5
     type: 100base-tx
-    poe_mode: pd
+    poe_mode: pse
     poe_type: passive-24v-2pair
     description: POE-OUT
   - name: Wireless 2.4 GHz
diff --git a/device-types/Nateks/FlexGain-FOM-4.yaml b/device-types/Nateks/FlexGain-FOM-4.yaml
new file mode 100644
index 00000000..4f72e349
--- /dev/null
+++ b/device-types/Nateks/FlexGain-FOM-4.yaml
@@ -0,0 +1,31 @@
+---
+manufacturer: Nateks
+model: FlexGain-FOM-4
+slug: nateks-flexgain-fom-4
+part_number: FlexGain-FOM-4
+comments: Nateks FlexGain-FOM-4  TDMoP MUX - 4*E1 + 1FE over 1/2 Fiber
+is_full_depth: false
+weight: 3
+weight_unit: kg
+airflow: passive
+u_height: 1
+console-ports:
+  - name: console
+    type: de-9
+power-ports:
+  - name: PSU
+    type: iec-60320-c14
+    maximum_draw: 12
+interfaces:
+  - name: TDM
+    type: 1000base-x-sfp
+  - name: eth-0
+    type: 100base-tx
+  - name: e1-port1
+    type: e1
+  - name: e1-port2
+    type: e1
+  - name: e1-port3
+    type: e1
+  - name: e1-port4
+    type: e1
diff --git a/device-types/QTECH/QSW-3470-28TX-AC.yaml b/device-types/QTECH/QSW-3470-28TX-AC.yaml
new file mode 100644
index 00000000..6dc60d96
--- /dev/null
+++ b/device-types/QTECH/QSW-3470-28TX-AC.yaml
@@ -0,0 +1,75 @@
+---
+manufacturer: QTECH
+model: QSW-3470-28TX-AC
+part_number: QSW-3470-28TX-AC
+slug: qtech-qsw-3470-28tx-ac
+u_height: 1
+airflow: right-to-left
+weight: 3.75
+weight_unit: kg
+comments: '[QTECH QSW-3470-28TX-AC](https://www.qtech.ru/catalog/switches/access/qsw_3470/qsw_3470_28tx_ac/)'
+is_full_depth: false
+console-ports:
+  - name: con 0
+    type: rj-45
+power-ports:
+  - name: PSU
+    type: iec-60320-c14
+    maximum_draw: 24
+interfaces:
+  - name: GigabitEthernet0/1
+    type: 1000base-t
+  - name: GigabitEthernet0/2
+    type: 1000base-t
+  - name: GigabitEthernet0/3
+    type: 1000base-t
+  - name: GigabitEthernet0/4
+    type: 1000base-t
+  - name: GigabitEthernet0/5
+    type: 1000base-t
+  - name: GigabitEthernet0/6
+    type: 1000base-t
+  - name: GigabitEthernet0/7
+    type: 1000base-t
+  - name: GigabitEthernet0/8
+    type: 1000base-t
+  - name: GigabitEthernet0/9
+    type: 1000base-t
+  - name: GigabitEthernet0/10
+    type: 1000base-t
+  - name: GigabitEthernet0/11
+    type: 1000base-t
+  - name: GigabitEthernet0/12
+    type: 1000base-t
+  - name: GigabitEthernet0/13
+    type: 1000base-t
+  - name: GigabitEthernet0/14
+    type: 1000base-t
+  - name: GigabitEthernet0/15
+    type: 1000base-t
+  - name: GigabitEthernet0/16
+    type: 1000base-t
+  - name: GigabitEthernet0/17
+    type: 1000base-t
+  - name: GigabitEthernet0/18
+    type: 1000base-t
+  - name: GigabitEthernet0/19
+    type: 1000base-t
+  - name: GigabitEthernet0/20
+    type: 1000base-t
+  - name: GigabitEthernet0/21
+    type: 1000base-t
+  - name: GigabitEthernet0/22
+    type: 1000base-t
+  - name: GigabitEthernet0/23
+    type: 1000base-t
+  - name: GigabitEthernet0/24
+    type: 1000base-t
+  - name: TenGigabitEthernet0/25
+    type: 10gbase-x-sfpp
+  - name: TenGigabitEthernet0/26
+    type: 10gbase-x-sfpp
+  - name: TenGigabitEthernet0/27
+    type: 10gbase-x-sfpp
+  - name: TenGigabitEthernet0/28
+    type: 10gbase-x-sfpp
diff --git a/device-types/SSD/SKON-DIN-1B.yaml b/device-types/SSD/SKON-DIN-1B.yaml
new file mode 100644
index 00000000..51c79b9c
--- /dev/null
+++ b/device-types/SSD/SKON-DIN-1B.yaml
@@ -0,0 +1,15 @@
+---
+manufacturer: SSD
+model: skon-din-1b
+slug: ssd-skon-din-1b
+comments: '[DIN-Rail Mount Enclosure up to 1 x optic Panels, 16 Fibers (LC)](https://ssd.ru/product/kross-shkon-rm-1-12-sc-korpus-/)'
+part_number: 130401-00083
+airflow: passive
+is_powered: false
+is_full_depth: false
+weight: 0.4
+weight_unit: kg
+u_height: 0
+module-bays:
+  - name: '1'
+    position: '1'
diff --git a/device-types/SSD/SKON-WALL-1B.yaml b/device-types/SSD/SKON-WALL-1B.yaml
new file mode 100644
index 00000000..8abe3415
--- /dev/null
+++ b/device-types/SSD/SKON-WALL-1B.yaml
@@ -0,0 +1,15 @@
+---
+manufacturer: SSD
+model: skon-wall-1b
+slug: ssd-skon-wall-1b
+comments: '[Wall Mount Enclosure up to 1 x optic Panels, 16 Fibers (LC)](https://ssd.ru/product/kross-shkon-r-1-16-lc-16-lc-sm-16-lc-upc/)'
+part_number: 130401-00077
+airflow: passive
+is_powered: false
+is_full_depth: false
+weight: 0.4
+weight_unit: kg
+u_height: 0
+module-bays:
+  - name: '1'
+    position: '1'
diff --git a/device-types/SSD/SKON-WALL-4B.yaml b/device-types/SSD/SKON-WALL-4B.yaml
new file mode 100644
index 00000000..8f1b2269
--- /dev/null
+++ b/device-types/SSD/SKON-WALL-4B.yaml
@@ -0,0 +1,21 @@
+---
+manufacturer: SSD
+model: skon-wall-4b
+slug: ssd-skon-wall-4b
+comments: '[Wall Mount Enclosure up to 4 x optic Panels, 64 Fibers (LC)](https://ssd.ru/product/kross-shkon-u-1-32-fc-st-korpus-/)'
+part_number: 130404-00012
+airflow: passive
+is_powered: false
+is_full_depth: false
+weight: 3
+weight_unit: kg
+u_height: 0
+module-bays:
+  - name: '1'
+    position: '1'
+  - name: '2'
+    position: '2'
+  - name: '3'
+    position: '3'
+  - name: '4'
+    position: '4'
diff --git a/device-types/Sprinter/Sprinter-TX-48-2E1-2FE-AC220.yaml b/device-types/Sprinter/Sprinter-TX-48-2E1-2FE-AC220.yaml
new file mode 100644
index 00000000..24ee36d2
--- /dev/null
+++ b/device-types/Sprinter/Sprinter-TX-48-2E1-2FE-AC220.yaml
@@ -0,0 +1,33 @@
+---
+manufacturer: Sprinter
+model: Sprinter TX 48-2E1-2FE-AC220
+slug: sprinter-tx-48-2e1-2fe-ac220
+part_number: Sprinter-TX-48-2E1-2FE-AC220
+comments: '[Sprinter-TX-48-2E1-2FE-AC220  TDMoP MUX](https://www.nsc-com.com/productions/telecommunications/sprinter-tx-48)'
+is_full_depth: false
+weight: 0.55
+weight_unit: kg
+airflow: passive
+u_height: 1
+console-ports:
+  - name: console
+    type: rj-45
+  - name: usb
+    type: usb-b
+power-ports:
+  - name: PSU
+    type: iec-60320-c14
+    maximum_draw: 6
+interfaces:
+  - name: port0
+    type: 1000base-x-sfp
+  - name: port1
+    type: 1000base-x-sfp
+  - name: eth-0
+    type: 100base-tx
+  - name: eth-1
+    type: 100base-tx
+  - name: e1-port1
+    type: e1
+  - name: e1-port2
+    type: e1