diff --git a/device-types/AVM/FRITZBox-6890-LTE.yaml b/device-types/AVM/FRITZBox-6890-LTE.yaml
new file mode 100644
index 000000000..1d7fa2faa
--- /dev/null
+++ b/device-types/AVM/FRITZBox-6890-LTE.yaml
@@ -0,0 +1,37 @@
+---
+manufacturer: AVM
+model: FRITZ!Box 6890 LTE
+slug: avm-fritzbox-6890-lte
+part_number: '20002817'
+u_height: 0
+is_full_depth: false
+airflow: passive
+comments: '[AVM FRITZ!Box 6890 Datasheet](https://avm.de/produkte/fritzbox/fritzbox-6890-lte/technische-daten/)'
+power-ports:
+  - name: Power
+    type: dc-terminal
+    maximum_draw: 10
+interfaces:
+  - name: DSL
+    label: DSL
+    type: xdsl
+  - name: FON
+    label: FON 2
+    type: other
+  - name: FONS0
+    label: FON S0
+    type: other
+  - name: WAN_LAN
+    label: WAN/LAN
+    type: 1000base-t
+  - name: LAN1
+    label: LAN 1
+    type: 1000base-t
+  - name: LAN2
+    label: LAN 2
+    type: 1000base-t
+  - name: LAN3
+    label: LAN 3
+    type: 1000base-t
+  - name: WiFi
+    type: ieee802.11ac
diff --git a/device-types/Allot/SSG-500.yaml b/device-types/Allot/SSG-500.yaml
new file mode 100644
index 000000000..66faa843c
--- /dev/null
+++ b/device-types/Allot/SSG-500.yaml
@@ -0,0 +1,57 @@
+---
+manufacturer: Allot
+model: Secure Service Gateway SSG-500
+part_number: SSG-500
+slug: allot-ssg-500
+u_height: 2
+is_full_depth: true
+weight: 44
+weight_unit: lb
+airflow: front-to-rear
+module-bays:
+  - name: PSU1
+    position: '1'
+  - name: PSU2
+    position: '2'
+interfaces:
+  - name: Management 1
+    type: 1000base-t
+    mgmt_only: true
+  - name: Management 2
+    type: 1000base-t
+    mgmt_only: true
+  - name: Interface 1
+    type: 10gbase-x-sfpp
+  - name: Interface 2
+    type: 10gbase-x-sfpp
+  - name: Interface 3
+    type: 10gbase-x-sfpp
+  - name: Interface 4
+    type: 10gbase-x-sfpp
+  - name: Interface 5
+    type: 10gbase-x-sfpp
+  - name: Interface 6
+    type: 10gbase-x-sfpp
+  - name: Interface 7
+    type: 10gbase-x-sfpp
+  - name: Interface 8
+    type: 10gbase-x-sfpp
+  - name: Interface 9
+    type: 10gbase-x-sfpp
+  - name: Interface 10
+    type: 10gbase-x-sfpp
+  - name: Interface 11
+    type: 10gbase-x-sfpp
+  - name: Interface 12
+    type: 10gbase-x-sfpp
+  - name: Interface 13
+    type: 10gbase-x-sfpp
+  - name: Interface 14
+    type: 10gbase-x-sfpp
+  - name: Interface 15
+    type: 10gbase-x-sfpp
+  - name: Interface 16
+    type: 10gbase-x-sfpp
+console-ports:
+  - name: Console
+    type: rj-45
diff --git a/device-types/Arctic-Wolf/awn1000-10g.yaml b/device-types/Arctic Wolf/awn1000-10g.yaml
similarity index 100%
rename from device-types/Arctic-Wolf/awn1000-10g.yaml
rename to device-types/Arctic Wolf/awn1000-10g.yaml
diff --git a/device-types/Arista/CCS-722XPM-48Y4-2F.yaml b/device-types/Arista/CCS-722XPM-48Y4-2F.yaml
new file mode 100644
index 000000000..f4bd28e04
--- /dev/null
+++ b/device-types/Arista/CCS-722XPM-48Y4-2F.yaml
@@ -0,0 +1,233 @@
+---
+manufacturer: Arista
+model: CCS-722XPM-48Y4-2F
+slug: arista-ccs-722xpm-48y4-2f
+part_number: CCS-722XPM-48Y4-2F
+u_height: 1
+weight: 15.0
+weight_unit: lb
+airflow: front-to-rear
+is_full_depth: false
+comments: '[Arista CCS 722XPM Data Sheet](https://www.arista.com/assets/data/pdf/Datasheets/CCS-722XP-Datasheet.pdf)'
+front_image: false
+rear_image: false
+console-ports:
+  - name: Console
+    type: rj-45
+module-bays:
+  - name: PS1
+    position: '0'
+  - name: PS2
+    position: '1'
+interfaces:
+  - name: Management1
+    type: 1000base-t
+    mgmt_only: true
+  - name: Ethernet1
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet2
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet3
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet4
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet5
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet6
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet7
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet8
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet9
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet10
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet11
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet12
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet13
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet14
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet15
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet16
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet17
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet18
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet19
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet20
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet21
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet22
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet23
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet24
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet25
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet26
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet27
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet28
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet29
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet30
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet31
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet32
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet33
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet34
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet35
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet36
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet37
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet38
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet39
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet40
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet41
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet42
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet43
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet44
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet45
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet46
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet47
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet48
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet49
+    type: 25gbase-x-sfp28
+  - name: Ethernet50
+    type: 25gbase-x-sfp28
+  - name: Ethernet51
+    type: 25gbase-x-sfp28
+  - name: Ethernet52
+    type: 25gbase-x-sfp28
+  - name: Ethernet53
+    type: 10gbase-x-sfpp
+  - name: Ethernet54
+    type: 10gbase-x-sfpp
+  - name: Ethernet55
+    type: 10gbase-x-sfpp
+  - name: Ethernet56
+    type: 10gbase-x-sfpp
diff --git a/device-types/Arista/CCS-722XPM-48ZY8-2F.yaml b/device-types/Arista/CCS-722XPM-48ZY8-2F.yaml
new file mode 100644
index 000000000..81640b06f
--- /dev/null
+++ b/device-types/Arista/CCS-722XPM-48ZY8-2F.yaml
@@ -0,0 +1,233 @@
+---
+manufacturer: Arista
+model: CCS-722XPM-48ZY8-2F
+slug: arista-ccs-722xpm-48zy8-2f
+part_number: CCS-722XPM-48ZY8-2F
+u_height: 1
+weight: 16.5
+weight_unit: lb
+airflow: front-to-rear
+is_full_depth: false
+comments: '[Arista CCS 722XPM Data Sheet](https://www.arista.com/assets/data/pdf/Datasheets/CCS-722XP-Datasheet.pdf)'
+front_image: false
+rear_image: false
+console-ports:
+  - name: Console
+    type: rj-45
+module-bays:
+  - name: PS1
+    position: '0'
+  - name: PS2
+    position: '1'
+interfaces:
+  - name: Management1
+    type: 1000base-t
+    mgmt_only: true
+  - name: Ethernet1
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet2
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet3
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet4
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet5
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet6
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet7
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet8
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet9
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet10
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet11
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet12
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet13
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet14
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet15
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet16
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet17
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet18
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet19
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet20
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet21
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet22
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet23
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet24
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet25
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet26
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet27
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet28
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet29
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet30
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet31
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet32
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet33
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet34
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet35
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet36
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet37
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet38
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet39
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet40
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet41
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet42
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet43
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet44
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet45
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet46
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet47
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet48
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Ethernet49
+    type: 25gbase-x-sfp28
+  - name: Ethernet50
+    type: 25gbase-x-sfp28
+  - name: Ethernet51
+    type: 25gbase-x-sfp28
+  - name: Ethernet52
+    type: 25gbase-x-sfp28
+  - name: Ethernet53
+    type: 25gbase-x-sfp28
+  - name: Ethernet54
+    type: 25gbase-x-sfp28
+  - name: Ethernet55
+    type: 25gbase-x-sfp28
+  - name: Ethernet56
+    type: 25gbase-x-sfp28
diff --git a/device-types/Check Point/MHO-140.yaml b/device-types/Check Point/MHO-140.yaml
new file mode 100644
index 000000000..a43d33182
--- /dev/null
+++ b/device-types/Check Point/MHO-140.yaml	
@@ -0,0 +1,136 @@
+---
+manufacturer: Check Point
+model: MHO-140
+slug: check-point-mho-140
+part_number: CPAP-MHO-140
+u_height: 1.0
+is_full_depth: true
+weight: 8.52
+weight_unit: kg
+console-ports:
+  - name: CONSOLE
+    type: rj-45
+module-bays:
+  - name: Power1
+    position: '1'
+  - name: Power2
+    position: '2'
+interfaces:
+  - name: '0'
+    type: 1000base-t
+    mgmt_only: true
+  - name: '1'
+    type: 1000base-t
+    mgmt_only: true
+  - name: sfp1
+    type: 25gbase-x-sfp28
+  - name: sfp2
+    type: 25gbase-x-sfp28
+  - name: sfp3
+    type: 25gbase-x-sfp28
+  - name: sfp4
+    type: 25gbase-x-sfp28
+  - name: sfp5
+    type: 25gbase-x-sfp28
+  - name: sfp6
+    type: 25gbase-x-sfp28
+  - name: sfp7
+    type: 25gbase-x-sfp28
+  - name: sfp8
+    type: 25gbase-x-sfp28
+  - name: sfp9
+    type: 25gbase-x-sfp28
+  - name: sfp10
+    type: 25gbase-x-sfp28
+  - name: sfp11
+    type: 25gbase-x-sfp28
+  - name: sfp12
+    type: 25gbase-x-sfp28
+  - name: sfp13
+    type: 25gbase-x-sfp28
+  - name: sfp14
+    type: 25gbase-x-sfp28
+  - name: sfp15
+    type: 25gbase-x-sfp28
+  - name: sfp16
+    type: 25gbase-x-sfp28
+  - name: sfp17
+    type: 25gbase-x-sfp28
+  - name: sfp18
+    type: 25gbase-x-sfp28
+  - name: sfp19
+    type: 25gbase-x-sfp28
+  - name: sfp20
+    type: 25gbase-x-sfp28
+  - name: sfp21
+    type: 25gbase-x-sfp28
+  - name: sfp22
+    type: 25gbase-x-sfp28
+  - name: sfp23
+    type: 25gbase-x-sfp28
+  - name: sfp24
+    type: 25gbase-x-sfp28
+  - name: sfp25
+    type: 25gbase-x-sfp28
+  - name: sfp26
+    type: 25gbase-x-sfp28
+  - name: sfp27
+    type: 25gbase-x-sfp28
+  - name: sfp28
+    type: 25gbase-x-sfp28
+  - name: sfp29
+    type: 25gbase-x-sfp28
+  - name: sfp30
+    type: 25gbase-x-sfp28
+  - name: sfp31
+    type: 25gbase-x-sfp28
+  - name: sfp32
+    type: 25gbase-x-sfp28
+  - name: sfp33
+    type: 25gbase-x-sfp28
+  - name: sfp34
+    type: 25gbase-x-sfp28
+  - name: sfp35
+    type: 25gbase-x-sfp28
+  - name: sfp36
+    type: 25gbase-x-sfp28
+  - name: sfp37
+    type: 25gbase-x-sfp28
+  - name: sfp38
+    type: 25gbase-x-sfp28
+  - name: sfp39
+    type: 25gbase-x-sfp28
+  - name: sfp40
+    type: 25gbase-x-sfp28
+  - name: sfp41
+    type: 25gbase-x-sfp28
+  - name: sfp42
+    type: 25gbase-x-sfp28
+  - name: sfp43
+    type: 25gbase-x-sfp28
+  - name: sfp44
+    type: 25gbase-x-sfp28
+  - name: sfp45
+    type: 25gbase-x-sfp28
+  - name: sfp46
+    type: 25gbase-x-sfp28
+  - name: sfp47
+    type: 25gbase-x-sfp28
+  - name: sfp48
+    type: 25gbase-x-sfp28
+  - name: qsfp49
+    type: 100gbase-x-qsfp28
+  - name: qsfp50
+    type: 100gbase-x-qsfp28
+  - name: qsfp51
+    type: 100gbase-x-qsfp28
+  - name: qsfp52
+    type: 100gbase-x-qsfp28
+  - name: qsfp53
+    type: 100gbase-x-qsfp28
+  - name: qsfp54
+    type: 100gbase-x-qsfp28
+  - name: qsfp55
+    type: 100gbase-x-qsfp28
+  - name: qsfp56
+    type: 100gbase-x-qsfp28
diff --git a/device-types/Check Point/SG1590.yaml b/device-types/Check Point/SG1590.yaml
new file mode 100644
index 000000000..4fa24917e
--- /dev/null
+++ b/device-types/Check Point/SG1590.yaml	
@@ -0,0 +1,39 @@
+---
+manufacturer: Check Point
+model: SG1590
+slug: check-point-sg1590
+part_number: CPAP-SG1590
+u_height: 1.0
+is_full_depth: false
+weight: 0.87
+weight_unit: kg
+airflow: passive
+power-ports:
+  - name: DC
+    type: dc-terminal
+console-ports:
+  - name: CONSOLE
+    type: usb-c
+interfaces:
+  - name: DMZ-RJ-45
+    type: 1000base-t
+  - name: DMZ-SFP
+    type: 1000base-x-sfp
+  - name: '1'
+    type: 1000base-t
+  - name: '2'
+    type: 1000base-t
+  - name: '3'
+    type: 1000base-t
+  - name: '4'
+    type: 1000base-t
+  - name: '5'
+    type: 1000base-t
+  - name: '6'
+    type: 1000base-t
+  - name: '7'
+    type: 1000base-t
+  - name: '8'
+    type: 1000base-t
+  - name: WAN
+    type: 1000base-t
diff --git a/device-types/Check Point/SG6200.yaml b/device-types/Check Point/SG6200.yaml
new file mode 100644
index 000000000..91b04dbc6
--- /dev/null
+++ b/device-types/Check Point/SG6200.yaml	
@@ -0,0 +1,58 @@
+---
+manufacturer: Check Point
+model: SG6200
+slug: check-point-sg6200
+part_number: CPAP-SG6200-SNBT
+u_height: 1
+weight: 6.75
+weight_unit: kg
+is_full_depth: true
+console-ports:
+  - name: ttyS0
+    label: CONSOLE
+    type: rj-45
+  - name: ttyS1
+    label: CONSOLE
+    type: usb-c
+power-ports:
+  - name: PS1
+    type: iec-60320-c14
+  - name: PS2
+    type: iec-60320-c14
+interfaces:
+  - name: eth1
+    label: '1'
+    type: 1000base-t
+  - name: eth2
+    label: '2'
+    type: 1000base-t
+  - name: eth3
+    label: '3'
+    type: 1000base-t
+  - name: eth4
+    label: '4'
+    type: 1000base-t
+  - name: eth5
+    label: '5'
+    type: 1000base-t
+  - name: eth6
+    label: '6'
+    type: 1000base-t
+  - name: eth7
+    label: '7'
+    type: 1000base-t
+  - name: eth8
+    label: '8'
+    type: 1000base-t
+  - name: Sync
+    label: SYNC
+    type: 1000base-t
+  - name: Mgmt
+    label: MGMT
+    type: 1000base-t
+  - name: lom
+    label: LOM
+    type: 1000base-t
+    mgmt_only: true
+module-bays:
+  - name: Line card 1
diff --git a/device-types/Cisco/N9K-C93108LC-EX.yaml b/device-types/Cisco/N9K-C93180LC-EX.yaml
similarity index 77%
rename from device-types/Cisco/N9K-C93108LC-EX.yaml
rename to device-types/Cisco/N9K-C93180LC-EX.yaml
index de3106ad8..d4dfb74ff 100644
--- a/device-types/Cisco/N9K-C93108LC-EX.yaml
+++ b/device-types/Cisco/N9K-C93180LC-EX.yaml
@@ -1,10 +1,16 @@
 ---
 manufacturer: Cisco
-model: Nexus 93108LC-EX
-slug: cisco-n9k-c93108lc-ex
-part_number: N9K-C93108LC-EX
+model: Nexus 93180LC-EX
+slug: cisco-n9k-c93180lc-ex
+part_number: N9K-C93180LC-EX
+description: Nexus 9K Fixed with up to 32p 40/50G QSFP+ or up to 18p 100G QSFP28
+comments: '[Cisco Nexus 9300-EX Series Switches Data Sheet](https://www.cisco.com/c/en/us/products/collateral/switches/nexus-9000-series-switches/datasheet-c78-742283.pdf)'
 u_height: 1
 is_full_depth: true
+front_image: true
+rear_image: true
+weight: 7.8
+weight_unit: kg
 console-ports:
   - name: Console
     type: rj-45
@@ -81,3 +87,11 @@ module-bays:
     position: '1'
   - name: PS2
     position: '2'
+  - name: Fan 1
+    position: '1'
+  - name: Fan 2
+    position: '2'
+  - name: Fan 3
+    position: '3'
+  - name: Fan 4
+    position: '4'
diff --git a/device-types/Cuda/WR3000-v1.yaml b/device-types/Cudy/WR3000-v1.yaml
similarity index 100%
rename from device-types/Cuda/WR3000-v1.yaml
rename to device-types/Cudy/WR3000-v1.yaml
diff --git a/device-types/D-Link/DGS-1210-10P.yaml b/device-types/D-Link/DGS-1210-10P.yaml
new file mode 100644
index 000000000..47f5d547b
--- /dev/null
+++ b/device-types/D-Link/DGS-1210-10P.yaml
@@ -0,0 +1,52 @@
+---
+manufacturer: D-Link
+model: DGS-1210-10P
+slug: d-link-dgs-1210-10p
+part_number: DGS-1210-10P
+u_height: 1.0
+is_full_depth: false
+airflow: passive
+weight: 0.95
+weight_unit: kg
+comments: '[D-Link DGS-1210-10P](https://www.dlink.com/en/products/dgs-1210-10p--10-port-gigabit-smart-managed-poe-switch)'
+power-ports:
+  - name: PS1
+    type: dc-terminal
+    maximum_draw: 82
+interfaces:
+  - name: GigabitEthernet1/0/1
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: GigabitEthernet1/0/2
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: GigabitEthernet1/0/3
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: GigabitEthernet1/0/4
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: GigabitEthernet1/0/5
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: GigabitEthernet1/0/6
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: GigabitEthernet1/0/7
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: GigabitEthernet1/0/8
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: GigabitEthernet1/0/9
+    type: 1000base-x-sfp
+  - name: GigabitEthernet1/0/10
+    type: 1000base-x-sfp
diff --git a/device-types/D-Link/DWS-3160-24TC.yaml b/device-types/D-Link/DWS-3160-24TC.yaml
new file mode 100644
index 000000000..07ca70d1c
--- /dev/null
+++ b/device-types/D-Link/DWS-3160-24TC.yaml
@@ -0,0 +1,72 @@
+---
+manufacturer: D-Link
+model: DWS-3160-24TC
+slug: d-link-dws-3160-24tc
+part_number: DWS-3160-24TC
+comments: '[D-Link DWS-3160 Series](https://www.dlink.com/uk/en/products/dws-3160-series-gigabit-l2plus-unified-managed-switches)'
+is_full_depth: false
+airflow: left-to-right
+weight: 2.55
+weight_unit: kg
+u_height: 1
+power-ports:
+  - name: PS1
+    type: iec-60320-c14
+    maximum_draw: 38
+interfaces:
+  - name: GigabitEthernet1/0/1
+    type: 1000base-t
+  - name: GigabitEthernet1/0/2
+    type: 1000base-t
+  - name: GigabitEthernet1/0/3
+    type: 1000base-t
+  - name: GigabitEthernet1/0/4
+    type: 1000base-t
+  - name: GigabitEthernet1/0/5
+    type: 1000base-t
+  - name: GigabitEthernet1/0/6
+    type: 1000base-t
+  - name: GigabitEthernet1/0/7
+    type: 1000base-t
+  - name: GigabitEthernet1/0/8
+    type: 1000base-t
+  - name: GigabitEthernet1/0/9
+    type: 1000base-t
+  - name: GigabitEthernet1/0/10
+    type: 1000base-t
+  - name: GigabitEthernet1/0/11
+    type: 1000base-t
+  - name: GigabitEthernet1/0/12
+    type: 1000base-t
+  - name: GigabitEthernet1/0/13
+    type: 1000base-t
+  - name: GigabitEthernet1/0/14
+    type: 1000base-t
+  - name: GigabitEthernet1/0/15
+    type: 1000base-t
+  - name: GigabitEthernet1/0/16
+    type: 1000base-t
+  - name: GigabitEthernet1/0/17
+    type: 1000base-t
+  - name: GigabitEthernet1/0/18
+    type: 1000base-t
+  - name: GigabitEthernet1/0/19
+    type: 1000base-t
+  - name: GigabitEthernet1/0/20
+    type: 1000base-t
+  - name: GigabitEthernet1/0/21T
+    type: 1000base-t
+  - name: GigabitEthernet1/0/22T
+    type: 1000base-t
+  - name: GigabitEthernet1/0/23T
+    type: 1000base-t
+  - name: GigabitEthernet1/0/24T
+    type: 1000base-t
+  - name: GigabitEthernet1/0/21F
+    type: 1000base-x-sfp
+  - name: GigabitEthernet1/0/22F
+    type: 1000base-x-sfp
+  - name: GigabitEthernet1/0/23F
+    type: 1000base-x-sfp
+  - name: GigabitEthernet1/0/24F
+    type: 1000base-x-sfp
diff --git a/device-types/Eltex/MES2428P.yml b/device-types/Eltex/MES2428P.yml
new file mode 100644
index 000000000..2216681f3
--- /dev/null
+++ b/device-types/Eltex/MES2428P.yml
@@ -0,0 +1,122 @@
+---
+manufacturer: Eltex
+model: MES2428P
+slug: eltex-mes2428p
+part_number: MES2428P
+u_height: 1.0
+is_full_depth: false
+airflow: front-to-rear
+weight: 3.27
+weight_unit: kg
+console-ports:
+  - name: Console1
+    type: rj-45
+power-ports:
+  - name: PSU#1
+    type: iec-60320-c14
+    maximum_draw: 420
+interfaces:
+  - name: gi0/1
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/2
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/3
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/4
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/5
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/6
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/7
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/8
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/9
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/10
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/11
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/12
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/13
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/14
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/15
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/16
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/17
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/18
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/19
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/20
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/21
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/22
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/23
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/24
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/25
+    type: 1000base-t
+  - name: gi0/26
+    type: 1000base-t
+  - name: gi0/27
+    type: 1000base-t
+  - name: gi0/28
+    type: 1000base-t
diff --git a/device-types/Eltex/MES2448P.yml b/device-types/Eltex/MES2448P.yml
new file mode 100644
index 000000000..05d9e34e2
--- /dev/null
+++ b/device-types/Eltex/MES2448P.yml
@@ -0,0 +1,220 @@
+---
+manufacturer: Eltex
+model: MES2448P
+slug: eltex-mes2448p
+part_number: MES2448P
+u_height: 1.0
+is_full_depth: true
+comments: '[MES2448p](https://eltex-co.com/catalog/ethernet_access_switch_mes2448p-en.php)'
+airflow: front-to-rear
+weight: 7.46
+weight_unit: kg
+console-ports:
+  - name: console01
+    type: rj-45
+module-bays:
+  - name: PSU1
+    position: '1'
+  - name: PSU2
+    position: '2'
+interfaces:
+  - name: gi0/1
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/2
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/3
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/4
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/5
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/6
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/7
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/8
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/9
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/10
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/11
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/12
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/13
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/14
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/15
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/16
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/17
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/18
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/19
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/20
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/21
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/22
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/23
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/24
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/25
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/26
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/27
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/28
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/29
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/30
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/31
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/32
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/33
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/34
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/35
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/36
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/37
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/38
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/39
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/40
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/41
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/42
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/43
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/44
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/45
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/46
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/47
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: gi0/48
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: te0/1
+    type: 10gbase-x-sfpp
+  - name: te0/2
+    type: 10gbase-x-sfpp
+  - name: te0/3
+    type: 10gbase-x-sfpp
+  - name: te0/4
+    type: 10gbase-x-sfpp
diff --git a/device-types/Eltex/esr-15r.yml b/device-types/Eltex/esr-15r.yml
new file mode 100644
index 000000000..ccc96dd0b
--- /dev/null
+++ b/device-types/Eltex/esr-15r.yml
@@ -0,0 +1,30 @@
+---
+manufacturer: Eltex
+model: ESR-15R
+slug: eltex-esr-15r
+part_number: ESR-15R
+u_height: 1.0
+is_full_depth: false
+airflow: passive
+weight: 1.4
+weight_unit: kg
+console-ports:
+  - name: console01
+    type: rj-45
+power-ports:
+  - name: PSU#1
+    type: iec-60320-c14
+    maximum_draw: 25
+interfaces:
+  - name: gi1/0/1
+    type: 1000base-t
+  - name: gi1/0/2
+    type: 1000base-t
+  - name: gi1/0/3
+    type: 1000base-t
+  - name: gi1/0/4
+    type: 1000base-t
+  - name: gi1/0/5
+    type: 1000base-x-sfp
+  - name: gi1/0/6
+    type: 1000base-x-sfp
diff --git a/device-types/Extreme Networks/5420F-16MW-32P-4XE.yaml b/device-types/Extreme Networks/5420F-16MW-32P-4XE.yaml
new file mode 100644
index 000000000..5f9d59ec0
--- /dev/null
+++ b/device-types/Extreme Networks/5420F-16MW-32P-4XE.yaml	
@@ -0,0 +1,232 @@
+---
+manufacturer: Extreme Networks
+model: 5420F-16MW-32P-4XE
+slug: extreme-networks-5420f-16mw-32p-4xe
+part_number: 5420F-16MW-32P-4XE
+u_height: 1
+is_full_depth: false
+weight: 5.30
+weight_unit: kg
+airflow: front-to-rear
+power-ports:
+  - name: C14
+    type: iec-60320-c14
+    maximum_draw: 2152
+module-bays:
+  - name: PS#2
+    position: '1'
+console-ports:
+  - name: Console
+    type: rj-45
+  - name: USB console
+    type: usb-micro-b
+interfaces:
+  - name: Mgmt
+    type: 1000base-t
+    mgmt_only: true
+  - name: '1'
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '2'
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '3'
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '4'
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '5'
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '6'
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '7'
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '8'
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '9'
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '10'
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '11'
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '12'
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '13'
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '14'
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '15'
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '16'
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '17'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '18'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '19'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '20'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '21'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '22'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '23'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '24'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '25'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '26'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '27'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '28'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '29'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '30'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '31'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '32'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '33'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '34'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '35'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '36'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '37'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '38'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '39'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '40'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '41'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '42'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '43'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '44'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '45'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '46'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '47'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '48'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '49'
+    type: 10gbase-x-sfpp
+  - name: '50'
+    type: 10gbase-x-sfpp
+  - name: '51'
+    type: 10gbase-x-sfpp
+  - name: '52'
+    type: 10gbase-x-sfpp
+  - name: U1
+    type: 100gbase-x-sfpdd
+    description: Can be used for stacking or 10Gb ethernet
+  - name: U2
+    type: 100gbase-x-sfpdd
+    description: Can be used for stacking or 10Gb ethernet
diff --git a/device-types/Extreme Networks/5420F-16W-32P-4XE.yaml b/device-types/Extreme Networks/5420F-16W-32P-4XE.yaml
new file mode 100644
index 000000000..d4d0c078b
--- /dev/null
+++ b/device-types/Extreme Networks/5420F-16W-32P-4XE.yaml	
@@ -0,0 +1,232 @@
+---
+manufacturer: Extreme Networks
+model: 5420F-16W-32P-4XE
+slug: extreme-networks-5420f-16w-32p-4xe
+part_number: 5420F-16W-32P-4XE
+u_height: 1
+is_full_depth: false
+weight: 5.36
+weight_unit: kg
+airflow: front-to-rear
+power-ports:
+  - name: C14
+    type: iec-60320-c14
+    maximum_draw: 2150
+module-bays:
+  - name: PS#2
+    position: '1'
+console-ports:
+  - name: Console
+    type: rj-45
+  - name: USB console
+    type: usb-micro-b
+interfaces:
+  - name: Mgmt
+    type: 1000base-t
+    mgmt_only: true
+  - name: '1'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '2'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '3'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '4'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '5'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '6'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '7'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '8'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '9'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '10'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '11'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '12'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '13'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '14'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '15'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '16'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '17'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '18'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '19'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '20'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '21'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '22'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '23'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '24'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '25'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '26'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '27'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '28'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '29'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '30'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '31'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '32'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '33'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '34'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '35'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '36'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '37'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '38'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '39'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '40'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '41'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '42'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '43'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '44'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '45'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '46'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '47'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '48'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '49'
+    type: 10gbase-x-sfpp
+  - name: '50'
+    type: 10gbase-x-sfpp
+  - name: '51'
+    type: 10gbase-x-sfpp
+  - name: '52'
+    type: 10gbase-x-sfpp
+  - name: U1
+    type: 100gbase-x-sfpdd
+    description: Can be used for stacking or 10Gb ethernet
+  - name: U2
+    type: 100gbase-x-sfpdd
+    description: Can be used for stacking or 10Gb ethernet
diff --git a/device-types/Extreme Networks/5420F-24P-4XE.yaml b/device-types/Extreme Networks/5420F-24P-4XE.yaml
new file mode 100644
index 000000000..9697c9e8d
--- /dev/null
+++ b/device-types/Extreme Networks/5420F-24P-4XE.yaml	
@@ -0,0 +1,136 @@
+---
+manufacturer: Extreme Networks
+model: 5420F-24P-4XE
+slug: extreme-networks-5420f-24p-4xe
+part_number: 5420F-24P-4XE
+u_height: 1
+is_full_depth: false
+weight: 4.64
+weight_unit: kg
+airflow: front-to-rear
+power-ports:
+  - name: C14
+    type: iec-60320-c14
+    maximum_draw: 833
+module-bays:
+  - name: PS#2
+    position: '1'
+console-ports:
+  - name: Console
+    type: rj-45
+  - name: USB console
+    type: usb-micro-b
+interfaces:
+  - name: Mgmt
+    type: 1000base-t
+    mgmt_only: true
+  - name: '1'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '2'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '3'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '4'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '5'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '6'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '7'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '8'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '9'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '10'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '11'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '12'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '13'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '14'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '15'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '16'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '17'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '18'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '19'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '20'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '21'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '22'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '23'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '24'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '25'
+    type: 10gbase-x-sfpp
+  - name: '26'
+    type: 10gbase-x-sfpp
+  - name: '27'
+    type: 10gbase-x-sfpp
+  - name: '28'
+    type: 10gbase-x-sfpp
+  - name: U1
+    type: 100gbase-x-sfpdd
+    description: Can be used for stacking or 10Gb ethernet
+  - name: U2
+    type: 100gbase-x-sfpdd
+    description: Can be used for stacking or 10Gb ethernet
diff --git a/device-types/Extreme Networks/5420F-24S-4XE.yaml b/device-types/Extreme Networks/5420F-24S-4XE.yaml
new file mode 100644
index 000000000..e532b2157
--- /dev/null
+++ b/device-types/Extreme Networks/5420F-24S-4XE.yaml	
@@ -0,0 +1,88 @@
+---
+manufacturer: Extreme Networks
+model: 5420F-24S-4XE
+slug: extreme-networks-5420f-24s-4xe
+part_number: 5420F-24S-4XE
+u_height: 1
+is_full_depth: false
+weight: 4.12
+weight_unit: kg
+airflow: front-to-rear
+power-ports:
+  - name: C14
+    type: iec-60320-c14
+    maximum_draw: 114
+module-bays:
+  - name: PS#2
+    position: '1'
+console-ports:
+  - name: Console
+    type: rj-45
+  - name: USB console
+    type: usb-micro-b
+interfaces:
+  - name: Mgmt
+    type: 1000base-t
+    mgmt_only: true
+  - name: '1'
+    type: 1000base-x-sfp
+  - name: '2'
+    type: 1000base-x-sfp
+  - name: '3'
+    type: 1000base-x-sfp
+  - name: '4'
+    type: 1000base-x-sfp
+  - name: '5'
+    type: 1000base-x-sfp
+  - name: '6'
+    type: 1000base-x-sfp
+  - name: '7'
+    type: 1000base-x-sfp
+  - name: '8'
+    type: 1000base-x-sfp
+  - name: '9'
+    type: 1000base-x-sfp
+  - name: '10'
+    type: 1000base-x-sfp
+  - name: '11'
+    type: 1000base-x-sfp
+  - name: '12'
+    type: 1000base-x-sfp
+  - name: '13'
+    type: 1000base-x-sfp
+  - name: '14'
+    type: 1000base-x-sfp
+  - name: '15'
+    type: 1000base-x-sfp
+  - name: '16'
+    type: 1000base-x-sfp
+  - name: '17'
+    type: 1000base-x-sfp
+  - name: '18'
+    type: 1000base-x-sfp
+  - name: '19'
+    type: 1000base-x-sfp
+  - name: '20'
+    type: 1000base-x-sfp
+  - name: '21'
+    type: 1000base-x-sfp
+  - name: '22'
+    type: 1000base-x-sfp
+  - name: '23'
+    type: 1000base-x-sfp
+  - name: '24'
+    type: 1000base-x-sfp
+  - name: '25'
+    type: 10gbase-x-sfpp
+  - name: '26'
+    type: 10gbase-x-sfpp
+  - name: '27'
+    type: 10gbase-x-sfpp
+  - name: '28'
+    type: 10gbase-x-sfpp
+  - name: U1
+    type: 100gbase-x-sfpdd
+    description: Can be used for stacking or 10Gb ethernet
+  - name: U2
+    type: 100gbase-x-sfpdd
+    description: Can be used for stacking or 10Gb ethernet
diff --git a/device-types/Extreme Networks/5420F-24T-4XE.yaml b/device-types/Extreme Networks/5420F-24T-4XE.yaml
new file mode 100644
index 000000000..b2f45f9f6
--- /dev/null
+++ b/device-types/Extreme Networks/5420F-24T-4XE.yaml	
@@ -0,0 +1,88 @@
+---
+manufacturer: Extreme Networks
+model: 5420F-24T-4XE
+slug: extreme-networks-5420f-24t-4xe
+part_number: 5420F-24T-4XE
+u_height: 1
+is_full_depth: false
+weight: 4.10
+weight_unit: kg
+airflow: front-to-rear
+power-ports:
+  - name: C14
+    type: iec-60320-c14
+    maximum_draw: 62
+module-bays:
+  - name: PS#2
+    position: '1'
+console-ports:
+  - name: Console
+    type: rj-45
+  - name: USB console
+    type: usb-micro-b
+interfaces:
+  - name: Mgmt
+    type: 1000base-t
+    mgmt_only: true
+  - name: '1'
+    type: 1000base-t
+  - name: '2'
+    type: 1000base-t
+  - name: '3'
+    type: 1000base-t
+  - name: '4'
+    type: 1000base-t
+  - name: '5'
+    type: 1000base-t
+  - name: '6'
+    type: 1000base-t
+  - name: '7'
+    type: 1000base-t
+  - name: '8'
+    type: 1000base-t
+  - name: '9'
+    type: 1000base-t
+  - name: '10'
+    type: 1000base-t
+  - name: '11'
+    type: 1000base-t
+  - name: '12'
+    type: 1000base-t
+  - name: '13'
+    type: 1000base-t
+  - name: '14'
+    type: 1000base-t
+  - name: '15'
+    type: 1000base-t
+  - name: '16'
+    type: 1000base-t
+  - name: '17'
+    type: 1000base-t
+  - name: '18'
+    type: 1000base-t
+  - name: '19'
+    type: 1000base-t
+  - name: '20'
+    type: 1000base-t
+  - name: '21'
+    type: 1000base-t
+  - name: '22'
+    type: 1000base-t
+  - name: '23'
+    type: 1000base-t
+  - name: '24'
+    type: 1000base-t
+  - name: '25'
+    type: 10gbase-x-sfpp
+  - name: '26'
+    type: 10gbase-x-sfpp
+  - name: '27'
+    type: 10gbase-x-sfpp
+  - name: '28'
+    type: 10gbase-x-sfpp
+  - name: U1
+    type: 100gbase-x-sfpdd
+    description: Can be used for stacking or 10Gb ethernet
+  - name: U2
+    type: 100gbase-x-sfpdd
+    description: Can be used for stacking or 10Gb ethernet
diff --git a/device-types/Extreme Networks/5420F-48P-4XE.yaml b/device-types/Extreme Networks/5420F-48P-4XE.yaml
new file mode 100644
index 000000000..12d0b80d0
--- /dev/null
+++ b/device-types/Extreme Networks/5420F-48P-4XE.yaml	
@@ -0,0 +1,232 @@
+---
+manufacturer: Extreme Networks
+model: 5420F-48P-4XE
+slug: extreme-networks-5420f-48p-4xe
+part_number: 5420F-48P-4XE
+u_height: 1
+is_full_depth: false
+weight: 5.28
+weight_unit: kg
+airflow: front-to-rear
+power-ports:
+  - name: C14
+    type: iec-60320-c14
+    maximum_draw: 1674
+module-bays:
+  - name: PS#2
+    position: '1'
+console-ports:
+  - name: Console
+    type: rj-45
+  - name: USB console
+    type: usb-micro-b
+interfaces:
+  - name: Mgmt
+    type: 1000base-t
+    mgmt_only: true
+  - name: '1'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '2'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '3'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '4'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '5'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '6'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '7'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '8'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '9'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '10'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '11'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '12'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '13'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '14'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '15'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '16'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '17'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '18'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '19'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '20'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '21'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '22'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '23'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '24'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '25'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '26'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '27'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '28'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '29'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '30'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '31'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '32'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '33'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '34'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '35'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '36'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '37'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '38'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '39'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '40'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '41'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '42'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '43'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '44'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '45'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '46'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '47'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '48'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '49'
+    type: 10gbase-x-sfpp
+  - name: '50'
+    type: 10gbase-x-sfpp
+  - name: '51'
+    type: 10gbase-x-sfpp
+  - name: '52'
+    type: 10gbase-x-sfpp
+  - name: U1
+    type: 100gbase-x-sfpdd
+    description: Can be used for stacking or 10Gb ethernet
+  - name: U2
+    type: 100gbase-x-sfpdd
+    description: Can be used for stacking or 10Gb ethernet
diff --git a/device-types/Extreme Networks/5420F-48P-4XL.yaml b/device-types/Extreme Networks/5420F-48P-4XL.yaml
new file mode 100644
index 000000000..118aa2bf1
--- /dev/null
+++ b/device-types/Extreme Networks/5420F-48P-4XL.yaml	
@@ -0,0 +1,236 @@
+---
+manufacturer: Extreme Networks
+model: 5420F-48P-4XL
+slug: extreme-networks-5420f-48p-4xl
+part_number: 5420F-48P-4XL
+u_height: 1
+is_full_depth: false
+weight: 5.28
+weight_unit: kg
+airflow: front-to-rear
+power-ports:
+  - name: C14
+    type: iec-60320-c14
+    maximum_draw: 1657
+module-bays:
+  - name: PS#2
+    position: '1'
+console-ports:
+  - name: Console
+    type: rj-45
+  - name: USB console
+    type: usb-micro-b
+interfaces:
+  - name: Mgmt
+    type: 1000base-t
+    mgmt_only: true
+  - name: '1'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '2'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '3'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '4'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '5'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '6'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '7'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '8'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '9'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '10'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '11'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '12'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '13'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '14'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '15'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '16'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '17'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '18'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '19'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '20'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '21'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '22'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '23'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '24'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '25'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '26'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '27'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '28'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '29'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '30'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '31'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '32'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '33'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '34'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '35'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '36'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '37'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '38'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '39'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '40'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '41'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '42'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '43'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '44'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '45'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '46'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '47'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '48'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '49'
+    type: 10gbase-x-sfpp
+    description: LRM capable
+  - name: '50'
+    type: 10gbase-x-sfpp
+    description: LRM capable
+  - name: '51'
+    type: 10gbase-x-sfpp
+    description: LRM capable
+  - name: '52'
+    type: 10gbase-x-sfpp
+    description: LRM capable
+  - name: U1
+    type: 100gbase-x-sfpdd
+    description: Can be used for stacking or 10Gb ethernet
+  - name: U2
+    type: 100gbase-x-sfpdd
+    description: Can be used for stacking or 10Gb ethernet
diff --git a/device-types/Extreme Networks/5420F-48T-4XE.yaml b/device-types/Extreme Networks/5420F-48T-4XE.yaml
new file mode 100644
index 000000000..858defd18
--- /dev/null
+++ b/device-types/Extreme Networks/5420F-48T-4XE.yaml	
@@ -0,0 +1,136 @@
+---
+manufacturer: Extreme Networks
+model: 5420F-48T-4XE
+slug: extreme-networks-5420f-48t-4xe
+part_number: 5420F-48T-4XE
+u_height: 1
+is_full_depth: false
+weight: 4.64
+weight_unit: kg
+airflow: front-to-rear
+power-ports:
+  - name: C14
+    type: iec-60320-c14
+    maximum_draw: 75
+module-bays:
+  - name: PS#2
+    position: '1'
+console-ports:
+  - name: Console
+    type: rj-45
+  - name: USB console
+    type: usb-micro-b
+interfaces:
+  - name: Mgmt
+    type: 1000base-t
+    mgmt_only: true
+  - name: '1'
+    type: 1000base-t
+  - name: '2'
+    type: 1000base-t
+  - name: '3'
+    type: 1000base-t
+  - name: '4'
+    type: 1000base-t
+  - name: '5'
+    type: 1000base-t
+  - name: '6'
+    type: 1000base-t
+  - name: '7'
+    type: 1000base-t
+  - name: '8'
+    type: 1000base-t
+  - name: '9'
+    type: 1000base-t
+  - name: '10'
+    type: 1000base-t
+  - name: '11'
+    type: 1000base-t
+  - name: '12'
+    type: 1000base-t
+  - name: '13'
+    type: 1000base-t
+  - name: '14'
+    type: 1000base-t
+  - name: '15'
+    type: 1000base-t
+  - name: '16'
+    type: 1000base-t
+  - name: '17'
+    type: 1000base-t
+  - name: '18'
+    type: 1000base-t
+  - name: '19'
+    type: 1000base-t
+  - name: '20'
+    type: 1000base-t
+  - name: '21'
+    type: 1000base-t
+  - name: '22'
+    type: 1000base-t
+  - name: '23'
+    type: 1000base-t
+  - name: '24'
+    type: 1000base-t
+  - name: '25'
+    type: 1000base-t
+  - name: '26'
+    type: 1000base-t
+  - name: '27'
+    type: 1000base-t
+  - name: '28'
+    type: 1000base-t
+  - name: '29'
+    type: 1000base-t
+  - name: '30'
+    type: 1000base-t
+  - name: '31'
+    type: 1000base-t
+  - name: '32'
+    type: 1000base-t
+  - name: '33'
+    type: 1000base-t
+  - name: '34'
+    type: 1000base-t
+  - name: '35'
+    type: 1000base-t
+  - name: '36'
+    type: 1000base-t
+  - name: '37'
+    type: 1000base-t
+  - name: '38'
+    type: 1000base-t
+  - name: '39'
+    type: 1000base-t
+  - name: '40'
+    type: 1000base-t
+  - name: '41'
+    type: 1000base-t
+  - name: '42'
+    type: 1000base-t
+  - name: '43'
+    type: 1000base-t
+  - name: '44'
+    type: 1000base-t
+  - name: '45'
+    type: 1000base-t
+  - name: '46'
+    type: 1000base-t
+  - name: '47'
+    type: 1000base-t
+  - name: '48'
+    type: 1000base-t
+  - name: '49'
+    type: 10gbase-x-sfpp
+  - name: '50'
+    type: 10gbase-x-sfpp
+  - name: '51'
+    type: 10gbase-x-sfpp
+  - name: '52'
+    type: 10gbase-x-sfpp
+  - name: U1
+    type: 100gbase-x-sfpdd
+    description: Can be used for stacking or 10Gb ethernet
+  - name: U2
+    type: 100gbase-x-sfpdd
+    description: Can be used for stacking or 10Gb ethernet
diff --git a/device-types/Extreme Networks/5420F-8W-16P-4XE.yaml b/device-types/Extreme Networks/5420F-8W-16P-4XE.yaml
new file mode 100644
index 000000000..e01e9bcc5
--- /dev/null
+++ b/device-types/Extreme Networks/5420F-8W-16P-4XE.yaml	
@@ -0,0 +1,136 @@
+---
+manufacturer: Extreme Networks
+model: 5420F-8W-16P-4XE
+slug: extreme-networks-5420f-8w-16p-4xe
+part_number: 5420F-8W-16P-4XE
+u_height: 1
+is_full_depth: false
+weight: 4.64
+weight_unit: kg
+airflow: front-to-rear
+power-ports:
+  - name: C14
+    type: iec-60320-c14
+    maximum_draw: 1092
+module-bays:
+  - name: PS#2
+    position: '1'
+console-ports:
+  - name: Console
+    type: rj-45
+  - name: USB console
+    type: usb-micro-b
+interfaces:
+  - name: Mgmt
+    type: 1000base-t
+    mgmt_only: true
+  - name: '1'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '2'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '3'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '4'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '5'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '6'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '7'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '8'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '9'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '10'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '11'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '12'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '13'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '14'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '15'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '16'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '17'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '18'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '19'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '20'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '21'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '22'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '23'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '24'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '25'
+    type: 10gbase-x-sfpp
+  - name: '26'
+    type: 10gbase-x-sfpp
+  - name: '27'
+    type: 10gbase-x-sfpp
+  - name: '28'
+    type: 10gbase-x-sfpp
+  - name: U1
+    type: 100gbase-x-sfpdd
+    description: Can be used for stacking or 10Gb ethernet
+  - name: U2
+    type: 100gbase-x-sfpdd
+    description: Can be used for stacking or 10Gb ethernet
diff --git a/device-types/Extreme Networks/5420M-16MW-32P-4YE.yaml b/device-types/Extreme Networks/5420M-16MW-32P-4YE.yaml
new file mode 100644
index 000000000..10b6804f6
--- /dev/null
+++ b/device-types/Extreme Networks/5420M-16MW-32P-4YE.yaml	
@@ -0,0 +1,230 @@
+---
+manufacturer: Extreme Networks
+model: 5420M-16MW-32P-4YE
+slug: extreme-networks-5420m-16mw-32p-4ye
+part_number: 5420M-16MW-32P-4YE
+u_height: 1
+is_full_depth: false
+weight: 5.30
+weight_unit: kg
+airflow: front-to-rear
+module-bays:
+  - name: PS#1
+    position: '1'
+  - name: PS#2
+    position: '2'
+console-ports:
+  - name: Console
+    type: rj-45
+  - name: USB console
+    type: usb-micro-b
+interfaces:
+  - name: Mgmt
+    type: 1000base-t
+    mgmt_only: true
+  - name: '1'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '2'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '3'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '4'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '5'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '6'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '7'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '8'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '9'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '10'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '11'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '12'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '13'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '14'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '15'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '16'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '17'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '18'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '19'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '20'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '21'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '22'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '23'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '24'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '25'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '26'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '27'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '28'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '29'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '30'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '31'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '32'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '33'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '34'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '35'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '36'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '37'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '38'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '39'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '40'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '41'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '42'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '43'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '44'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '45'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '46'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '47'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '48'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: '49'
+    type: 25gbase-x-sfp28
+  - name: '50'
+    type: 25gbase-x-sfp28
+  - name: '51'
+    type: 25gbase-x-sfp28
+  - name: '52'
+    type: 25gbase-x-sfp28
+  - name: U1
+    type: 100gbase-x-sfpdd
+    description: Can be used for stacking or 10Gb ethernet
+  - name: U2
+    type: 100gbase-x-sfpdd
+    description: Can be used for stacking or 10Gb ethernet
diff --git a/device-types/Extreme Networks/5420M-24T-4YE.yaml b/device-types/Extreme Networks/5420M-24T-4YE.yaml
new file mode 100644
index 000000000..953f0ac97
--- /dev/null
+++ b/device-types/Extreme Networks/5420M-24T-4YE.yaml	
@@ -0,0 +1,86 @@
+---
+manufacturer: Extreme Networks
+model: 5420M-24T-4YE
+slug: extreme-networks-5420m-24t-4ye
+part_number: 5420M-24T-4YE
+u_height: 1
+is_full_depth: false
+weight: 4.18
+weight_unit: kg
+airflow: front-to-rear
+module-bays:
+  - name: PS#1
+    position: '1'
+  - name: PS#2
+    position: '2'
+console-ports:
+  - name: Console
+    type: rj-45
+  - name: USB console
+    type: usb-micro-b
+interfaces:
+  - name: Mgmt
+    type: 1000base-t
+    mgmt_only: true
+  - name: '1'
+    type: 1000base-t
+  - name: '2'
+    type: 1000base-t
+  - name: '3'
+    type: 1000base-t
+  - name: '4'
+    type: 1000base-t
+  - name: '5'
+    type: 1000base-t
+  - name: '6'
+    type: 1000base-t
+  - name: '7'
+    type: 1000base-t
+  - name: '8'
+    type: 1000base-t
+  - name: '9'
+    type: 1000base-t
+  - name: '10'
+    type: 1000base-t
+  - name: '11'
+    type: 1000base-t
+  - name: '12'
+    type: 1000base-t
+  - name: '13'
+    type: 1000base-t
+  - name: '14'
+    type: 1000base-t
+  - name: '15'
+    type: 1000base-t
+  - name: '16'
+    type: 1000base-t
+  - name: '17'
+    type: 1000base-t
+  - name: '18'
+    type: 1000base-t
+  - name: '19'
+    type: 1000base-t
+  - name: '20'
+    type: 1000base-t
+  - name: '21'
+    type: 1000base-t
+  - name: '22'
+    type: 1000base-t
+  - name: '23'
+    type: 1000base-t
+  - name: '24'
+    type: 1000base-t
+  - name: '25'
+    type: 25gbase-x-sfp28
+  - name: '26'
+    type: 25gbase-x-sfp28
+  - name: '27'
+    type: 25gbase-x-sfp28
+  - name: '28'
+    type: 25gbase-x-sfp28
+  - name: U1
+    type: 100gbase-x-sfpdd
+    description: Can be used for stacking or 2x 10Gb ethernet
+  - name: U2
+    type: 100gbase-x-sfpdd
+    description: Can be used for stacking or 2x 10Gb ethernet
diff --git a/device-types/Extreme Networks/5420M-24W-4YE.yaml b/device-types/Extreme Networks/5420M-24W-4YE.yaml
new file mode 100644
index 000000000..8089c4a35
--- /dev/null
+++ b/device-types/Extreme Networks/5420M-24W-4YE.yaml	
@@ -0,0 +1,134 @@
+---
+manufacturer: Extreme Networks
+model: 5420M-24W-4YE
+slug: extreme-networks-5420m-24w-4ye
+part_number: 5420M-24W-4YE
+u_height: 1
+is_full_depth: false
+weight: 4.40
+weight_unit: kg
+airflow: front-to-rear
+module-bays:
+  - name: PS#1
+    position: '1'
+  - name: PS#2
+    position: '2'
+console-ports:
+  - name: Console
+    type: rj-45
+  - name: USB console
+    type: usb-micro-b
+interfaces:
+  - name: Mgmt
+    type: 1000base-t
+    mgmt_only: true
+  - name: '1'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '2'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '3'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '4'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '5'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '6'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '7'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '8'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '9'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '10'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '11'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '12'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '13'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '14'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '15'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '16'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '17'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '18'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '19'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '20'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '21'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '22'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '23'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '24'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '25'
+    type: 25gbase-x-sfp28
+  - name: '26'
+    type: 25gbase-x-sfp28
+  - name: '27'
+    type: 25gbase-x-sfp28
+  - name: '28'
+    type: 25gbase-x-sfp28
+  - name: U1
+    type: 100gbase-x-sfpdd
+    description: Can be used for stacking or 2x 10Gb ethernet
+  - name: U2
+    type: 100gbase-x-sfpdd
+    description: Can be used for stacking or 2x 10Gb ethernet
diff --git a/device-types/Extreme Networks/5420M-48T-4YE.yaml b/device-types/Extreme Networks/5420M-48T-4YE.yaml
new file mode 100644
index 000000000..3cc77ff88
--- /dev/null
+++ b/device-types/Extreme Networks/5420M-48T-4YE.yaml	
@@ -0,0 +1,134 @@
+---
+manufacturer: Extreme Networks
+model: 5420M-48T-4YE
+slug: extreme-networks-5420m-48t-4ye
+part_number: 5420M-48T-4YE
+u_height: 1
+is_full_depth: false
+weight: 4.39
+weight_unit: kg
+airflow: front-to-rear
+module-bays:
+  - name: PS#1
+    position: '1'
+  - name: PS#2
+    position: '2'
+console-ports:
+  - name: Console
+    type: rj-45
+  - name: USB console
+    type: usb-micro-b
+interfaces:
+  - name: Mgmt
+    type: 1000base-t
+    mgmt_only: true
+  - name: '1'
+    type: 1000base-t
+  - name: '2'
+    type: 1000base-t
+  - name: '3'
+    type: 1000base-t
+  - name: '4'
+    type: 1000base-t
+  - name: '5'
+    type: 1000base-t
+  - name: '6'
+    type: 1000base-t
+  - name: '7'
+    type: 1000base-t
+  - name: '8'
+    type: 1000base-t
+  - name: '9'
+    type: 1000base-t
+  - name: '10'
+    type: 1000base-t
+  - name: '11'
+    type: 1000base-t
+  - name: '12'
+    type: 1000base-t
+  - name: '13'
+    type: 1000base-t
+  - name: '14'
+    type: 1000base-t
+  - name: '15'
+    type: 1000base-t
+  - name: '16'
+    type: 1000base-t
+  - name: '17'
+    type: 1000base-t
+  - name: '18'
+    type: 1000base-t
+  - name: '19'
+    type: 1000base-t
+  - name: '20'
+    type: 1000base-t
+  - name: '21'
+    type: 1000base-t
+  - name: '22'
+    type: 1000base-t
+  - name: '23'
+    type: 1000base-t
+  - name: '24'
+    type: 1000base-t
+  - name: '25'
+    type: 1000base-t
+  - name: '26'
+    type: 1000base-t
+  - name: '27'
+    type: 1000base-t
+  - name: '28'
+    type: 1000base-t
+  - name: '29'
+    type: 1000base-t
+  - name: '30'
+    type: 1000base-t
+  - name: '31'
+    type: 1000base-t
+  - name: '32'
+    type: 1000base-t
+  - name: '33'
+    type: 1000base-t
+  - name: '34'
+    type: 1000base-t
+  - name: '35'
+    type: 1000base-t
+  - name: '36'
+    type: 1000base-t
+  - name: '37'
+    type: 1000base-t
+  - name: '38'
+    type: 1000base-t
+  - name: '39'
+    type: 1000base-t
+  - name: '40'
+    type: 1000base-t
+  - name: '41'
+    type: 1000base-t
+  - name: '42'
+    type: 1000base-t
+  - name: '43'
+    type: 1000base-t
+  - name: '44'
+    type: 1000base-t
+  - name: '45'
+    type: 1000base-t
+  - name: '46'
+    type: 1000base-t
+  - name: '47'
+    type: 1000base-t
+  - name: '48'
+    type: 1000base-t
+  - name: '49'
+    type: 25gbase-x-sfp28
+  - name: '50'
+    type: 25gbase-x-sfp28
+  - name: '51'
+    type: 25gbase-x-sfp28
+  - name: '52'
+    type: 25gbase-x-sfp28
+  - name: U1
+    type: 100gbase-x-sfpdd
+    description: Can be used for stacking or 2x 10Gb ethernet
+  - name: U2
+    type: 100gbase-x-sfpdd
+    description: Can be used for stacking or 2x 10Gb ethernet
diff --git a/device-types/Extreme Networks/5420M-48W-4YE.yaml b/device-types/Extreme Networks/5420M-48W-4YE.yaml
new file mode 100644
index 000000000..7fbb88248
--- /dev/null
+++ b/device-types/Extreme Networks/5420M-48W-4YE.yaml	
@@ -0,0 +1,230 @@
+---
+manufacturer: Extreme Networks
+model: 5420M-48W-4YE
+slug: extreme-networks-5420m-48w-4ye
+part_number: 5420M-48W-4YE
+u_height: 1
+is_full_depth: false
+weight: 4.73
+weight_unit: kg
+airflow: front-to-rear
+module-bays:
+  - name: PS#1
+    position: '1'
+  - name: PS#2
+    position: '2'
+console-ports:
+  - name: Console
+    type: rj-45
+  - name: USB console
+    type: usb-micro-b
+interfaces:
+  - name: Mgmt
+    type: 1000base-t
+    mgmt_only: true
+  - name: '1'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '2'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '3'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '4'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '5'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '6'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '7'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '8'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '9'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '10'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '11'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '12'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '13'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '14'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '15'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '16'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '17'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '18'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '19'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '20'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '21'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '22'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '23'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '24'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '25'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '26'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '27'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '28'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '29'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '30'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '31'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '32'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '33'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '34'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '35'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '36'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '37'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '38'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '39'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '40'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '41'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '42'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '43'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '44'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '45'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '46'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '47'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '48'
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '49'
+    type: 25gbase-x-sfp28
+  - name: '50'
+    type: 25gbase-x-sfp28
+  - name: '51'
+    type: 25gbase-x-sfp28
+  - name: '52'
+    type: 25gbase-x-sfp28
+  - name: U1
+    type: 100gbase-x-sfpdd
+    description: Can be used for stacking or 2x 10Gb ethernet
+  - name: U2
+    type: 100gbase-x-sfpdd
+    description: Can be used for stacking or 2x 10Gb ethernet
diff --git a/device-types/Extreme Networks/5720-24MW.yaml b/device-types/Extreme Networks/5720-24MW.yaml
new file mode 100644
index 000000000..012e9427c
--- /dev/null
+++ b/device-types/Extreme Networks/5720-24MW.yaml	
@@ -0,0 +1,127 @@
+---
+manufacturer: Extreme Networks
+model: 5720-24MW
+slug: extreme-networks-5720-24mw
+part_number: 5720-24MW
+u_height: 1
+is_full_depth: true
+weight: 8.05
+weight_unit: kg
+airflow: front-to-rear
+module-bays:
+  - name: PS#1
+    position: '1'
+  - name: PS#2
+    position: '2'
+  - name: VIM
+console-ports:
+  - name: Console
+    type: rj-45
+  - name: USB console
+    type: usb-micro-b
+interfaces:
+  - name: Mgmt
+    type: 1000base-t
+    mgmt_only: true
+  - name: '1'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '2'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '3'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '4'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '5'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '6'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '7'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '8'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '9'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '10'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '11'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '12'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '13'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '14'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '15'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '16'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '17'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '18'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '19'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '20'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '21'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '22'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '23'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '24'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: U1
+    type: 100gbase-x-qsfp28
+    description: Can be used for stacking or as various speed normal interfaces
+  - name: U2
+    type: 100gbase-x-qsfp28
+    description: Can be used for stacking or as various speed normal interfaces
diff --git a/device-types/Extreme Networks/5720-24MXW.yaml b/device-types/Extreme Networks/5720-24MXW.yaml
new file mode 100644
index 000000000..7f02b701a
--- /dev/null
+++ b/device-types/Extreme Networks/5720-24MXW.yaml	
@@ -0,0 +1,127 @@
+---
+manufacturer: Extreme Networks
+model: 5720-24MXW
+slug: extreme-networks-5720-24mxw
+part_number: 5720-24MXW
+u_height: 1
+is_full_depth: true
+weight: 8.05
+weight_unit: kg
+airflow: front-to-rear
+module-bays:
+  - name: PS#1
+    position: '1'
+  - name: PS#2
+    position: '2'
+  - name: VIM
+console-ports:
+  - name: Console
+    type: rj-45
+  - name: USB console
+    type: usb-micro-b
+interfaces:
+  - name: Mgmt
+    type: 1000base-t
+    mgmt_only: true
+  - name: '1'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '2'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '3'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '4'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '5'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '6'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '7'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '8'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '9'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '10'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '11'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '12'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '13'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '14'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '15'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '16'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '17'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '18'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '19'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '20'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '21'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '22'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '23'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '24'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: U1
+    type: 100gbase-x-qsfp28
+    description: Can be used for stacking or as various speed normal interfaces
+  - name: U2
+    type: 100gbase-x-qsfp28
+    description: Can be used for stacking or as various speed normal interfaces
diff --git a/device-types/Extreme Networks/5720-48MW.yaml b/device-types/Extreme Networks/5720-48MW.yaml
new file mode 100644
index 000000000..38fc167b6
--- /dev/null
+++ b/device-types/Extreme Networks/5720-48MW.yaml	
@@ -0,0 +1,222 @@
+---
+manufacturer: Extreme Networks
+model: 5720-48MW
+slug: extreme-networks-5720-48mw
+part_number: 5720-48MW
+u_height: 1
+is_full_depth: true
+weight: 8.55
+weight_unit: kg
+airflow: front-to-rear
+module-bays:
+  - name: PS#1
+    position: '1'
+  - name: PS#2
+    position: '2'
+console-ports:
+  - name: Console
+    type: rj-45
+  - name: USB console
+    type: usb-micro-b
+interfaces:
+  - name: Mgmt
+    type: 1000base-t
+    mgmt_only: true
+  - name: '1'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '2'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '3'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '4'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '5'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '6'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '7'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '8'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '9'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '10'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '11'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '12'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '13'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '14'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '15'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '16'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '17'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '18'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '19'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '20'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '21'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '22'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '23'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '24'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '25'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '26'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '27'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '28'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '29'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '30'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '31'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '32'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '33'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '34'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '35'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '36'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '37'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '38'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '39'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '40'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '41'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '42'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '43'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '44'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '45'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '46'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '47'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '48'
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: U1
+    type: 100gbase-x-qsfp28
+    description: Can be used for stacking or as various speed normal interfaces
+  - name: U2
+    type: 100gbase-x-qsfp28
+    description: Can be used for stacking or as various speed normal interfaces
diff --git a/device-types/Extreme Networks/5720-48MXW.yaml b/device-types/Extreme Networks/5720-48MXW.yaml
new file mode 100644
index 000000000..cadd65f78
--- /dev/null
+++ b/device-types/Extreme Networks/5720-48MXW.yaml	
@@ -0,0 +1,222 @@
+---
+manufacturer: Extreme Networks
+model: 5720-48MXW
+slug: extreme-networks-5720-48mxw
+part_number: 5720-48MXW
+u_height: 1
+is_full_depth: true
+weight: 8.55
+weight_unit: kg
+airflow: front-to-rear
+module-bays:
+  - name: PS#1
+    position: '1'
+  - name: PS#2
+    position: '2'
+console-ports:
+  - name: Console
+    type: rj-45
+  - name: USB console
+    type: usb-micro-b
+interfaces:
+  - name: Mgmt
+    type: 1000base-t
+    mgmt_only: true
+  - name: '1'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '2'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '3'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '4'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '5'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '6'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '7'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '8'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '9'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '10'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '11'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '12'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '13'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '14'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '15'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '16'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '17'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '18'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '19'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '20'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '21'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '22'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '23'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '24'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '25'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '26'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '27'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '28'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '29'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '30'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '31'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '32'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '33'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '34'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '35'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '36'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '37'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '38'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '39'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '40'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '41'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '42'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '43'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '44'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '45'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '46'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '47'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: '48'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+  - name: U1
+    type: 100gbase-x-qsfp28
+    description: Can be used for stacking or as various speed normal interfaces
+  - name: U2
+    type: 100gbase-x-qsfp28
+    description: Can be used for stacking or as various speed normal interfaces
diff --git a/device-types/Fortinet/FG-200F.yaml b/device-types/Fortinet/FG-200F.yaml
index 28c683c37..ab6fd4d04 100644
--- a/device-types/Fortinet/FG-200F.yaml
+++ b/device-types/Fortinet/FG-200F.yaml
@@ -3,10 +3,14 @@ manufacturer: Fortinet
 model: FortiGate 200F
 slug: fortinet-fg-200f
 part_number: FG-200F
-u_height: 1
-is_full_depth: false
+u_height: 1.0
+airflow: side-to-rear
+weight: 4.5
+weight_unit: kg
+comments: '[FortiGate 200F Series](https://www.fortinet.com/resources/data-sheets/fortigate-200f-series)'
 console-ports:
   - name: Console
+    label: CONSOLE
     type: rj-45
 power-ports:
   - name: PS1
@@ -20,61 +24,122 @@ power-ports:
 interfaces:
   - name: ha
     type: 1000base-t
+    enabled: true
+    label: HA
   - name: mgmt
     type: 1000base-t
+    enabled: true
+    mgmt_only: true
+    label: MGMT
   - name: port1
     type: 1000base-t
+    enabled: true
+    label: '1'
   - name: port2
     type: 1000base-t
+    enabled: true
+    label: '2'
   - name: port3
     type: 1000base-t
+    enabled: true
+    label: '3'
   - name: port4
     type: 1000base-t
+    enabled: true
+    label: '4'
   - name: port5
     type: 1000base-t
+    enabled: true
+    label: '5'
   - name: port6
     type: 1000base-t
+    enabled: true
+    label: '6'
   - name: port7
     type: 1000base-t
+    enabled: true
+    label: '7'
   - name: port8
     type: 1000base-t
+    enabled: true
+    label: '8'
   - name: port9
     type: 1000base-t
+    enabled: true
+    label: '9'
   - name: port10
     type: 1000base-t
+    enabled: true
+    label: '10'
   - name: port11
     type: 1000base-t
+    enabled: true
+    label: '11'
   - name: port12
     type: 1000base-t
+    enabled: true
+    label: '12'
   - name: port13
     type: 1000base-t
+    enabled: true
+    label: '13'
   - name: port14
     type: 1000base-t
+    enabled: true
+    label: '14'
   - name: port15
     type: 1000base-t
+    enabled: true
+    label: '15'
   - name: port16
     type: 1000base-t
-  - name: x1
-    type: 10gbase-x-sfpp
-  - name: x2
-    type: 10gbase-x-sfpp
-  - name: x3
-    type: 10gbase-x-sfpp
-  - name: x4
-    type: 10gbase-x-sfpp
+    enabled: true
+    label: '16'
   - name: port17
     type: 1000base-x-sfp
+    enabled: true
+    label: '17'
   - name: port18
     type: 1000base-x-sfp
+    enabled: true
+    label: '18'
   - name: port19
     type: 1000base-x-sfp
+    enabled: true
+    label: '19'
   - name: port20
     type: 1000base-x-sfp
+    enabled: true
+    label: '20'
   - name: port21
     type: 1000base-x-sfp
+    enabled: true
+    label: '21'
   - name: port22
     type: 1000base-x-sfp
+    enabled: true
+    label: '22'
   - name: port23
     type: 1000base-x-sfp
+    enabled: true
+    label: '23'
   - name: port24
     type: 1000base-x-sfp
+    enabled: true
+    label: '24'
+  - name: x1
+    type: 10gbase-x-sfpp
+    enabled: true
+    label: X1
+  - name: x2
+    type: 10gbase-x-sfpp
+    enabled: true
+    label: X2
+  - name: x3
+    type: 10gbase-x-sfpp
+    enabled: true
+    label: X3
+  - name: x4
+    type: 10gbase-x-sfpp
+    enabled: true
+    label: X4
diff --git a/device-types/HPE/ProLiant-DL20-Gen10.yaml b/device-types/HPE/ProLiant-DL20-Gen10.yaml
new file mode 100644
index 000000000..62dd25416
--- /dev/null
+++ b/device-types/HPE/ProLiant-DL20-Gen10.yaml
@@ -0,0 +1,31 @@
+---
+manufacturer: HPE
+model: ProLiant DL20 Gen10
+slug: hpe-proliant-dl20-gen10
+u_height: 1.0
+is_full_depth: true
+comments: '[HP ProLiant DL20 Gen10 QuickSpecs](https://www.hpe.com/psnow/doc/a00053820enw)'
+weight: 17.41
+weight_unit: lb
+console-ports:
+  - name: Serial
+    type: de-9
+module-bays:
+  - name: PSU1
+    position: PSU1
+  - name: PSU2
+    position: PSU2
+  - name: PCIe1
+    position: PCIe1
+  - name: PCIe2
+    position: PCIe2
+interfaces:
+  - name: Gig-E 1
+    type: 1000base-t
+    mgmt_only: false
+  - name: Gig-E 2
+    type: 1000base-t
+    mgmt_only: false
+  - name: iLO
+    type: 1000base-t
+    mgmt_only: true
diff --git a/device-types/HPE/ProLiant-ML30-Gen10-plus.yaml b/device-types/HPE/ProLiant-ML30-Gen10-plus.yaml
new file mode 100644
index 000000000..470d9de0d
--- /dev/null
+++ b/device-types/HPE/ProLiant-ML30-Gen10-plus.yaml
@@ -0,0 +1,31 @@
+---
+manufacturer: HPE
+model: ProLiant ML30 Gen10 Plus
+slug: hpe-proliant-ml30-gen10-plus
+part_number: P44720-421
+u_height: 4
+weight: 10.1
+weight_unit: kg
+airflow: front-to-rear
+is_full_depth: true
+module-bays:
+  - name: PCIe1
+    position: PCIe1
+  - name: PCIe2
+    position: PCIe2
+  - name: PCIe3
+    position: PCIe3
+  - name: PCIe4
+    position: PCIe4
+  - name: PSU1
+    position: PSU1
+  - name: PSU2
+    position: PSU2
+interfaces:
+  - name: Gig-E 1
+    type: 1000base-t
+  - name: Gig-E 2
+    type: 1000base-t
+  - name: iLO
+    type: 1000base-t
+    mgmt_only: true
diff --git a/device-types/HPE/ProLiant-Microserver-Gen10.yaml b/device-types/HPE/ProLiant-Microserver-Gen10.yaml
new file mode 100644
index 000000000..87ea62796
--- /dev/null
+++ b/device-types/HPE/ProLiant-Microserver-Gen10.yaml
@@ -0,0 +1,25 @@
+---
+manufacturer: HPE
+model: ProLiant MicroServer Gen10
+slug: hpe-proliant-microserver-gen10
+u_height: 0
+is_full_depth: false
+airflow: front-to-rear
+weight: 6.5
+weight_unit: kg
+interfaces:
+  - name: Gig-E 1
+    type: 1000base-t
+  - name: Gig-E 2
+    type: 1000base-t
+module-bays:
+  - name: PCIe1
+    position: PCIe1
+  - name: PCIe2
+    position: PCIe2
+power-ports:
+  - name: PSU
+    type: iec-60320-c14
+    maximum_draw: 200
+description: HPE ProLiant MicroServer Gen10
+comments: '[PSnow: HPE ProLiant MicroServer Gen11](https://support.hpe.com/hpesc/public/docDisplay?docId=a00008701enw&docLocale=en_US)'
diff --git a/device-types/HPE/ProLiant-Microserver-Gen11.yaml b/device-types/HPE/ProLiant-Microserver-Gen11.yaml
new file mode 100644
index 000000000..1e2913201
--- /dev/null
+++ b/device-types/HPE/ProLiant-Microserver-Gen11.yaml
@@ -0,0 +1,31 @@
+---
+manufacturer: HPE
+model: ProLiant MicroServer Gen11
+slug: hpe-proliant-microserver-gen11
+u_height: 0
+is_full_depth: false
+airflow: front-to-rear
+weight: 8.65
+weight_unit: kg
+interfaces:
+  - name: Gig-E 1
+    type: 1000base-t
+  - name: Gig-E 2
+    type: 1000base-t
+  - name: Gig-E 3
+    type: 1000base-t
+  - name: Gig-E 4
+    type: 1000base-t
+module-bays:
+  - name: PCIe1
+    position: PCIe1
+  - name: PCIe2
+    position: PCIe2
+  - name: iLO/M.2/Serial port
+    position: iLO/M.2/Serial port
+power-ports:
+  - name: PSU
+    type: dc-terminal
+    maximum_draw: 180
+description: HPE ProLiant MicroServer Gen11
+comments: '[PSnow: HPE ProLiant MicroServer Gen11](https://www.hpe.com/psnow/doc/PSN1014826370USEN.pdf?jumpid=in_pdp-psnow-dds)'
diff --git a/device-types/CE6885-48YS8CQ.yaml b/device-types/Huawei/CE6885-48YS8CQ.yaml
similarity index 100%
rename from device-types/CE6885-48YS8CQ.yaml
rename to device-types/Huawei/CE6885-48YS8CQ.yaml
diff --git a/device-types/Juniper/EX2200-C-12P.yaml b/device-types/Juniper/EX2200-C-12P.yaml
index 03c2a0df2..eaeba0cc2 100644
--- a/device-types/Juniper/EX2200-C-12P.yaml
+++ b/device-types/Juniper/EX2200-C-12P.yaml
@@ -3,6 +3,7 @@ manufacturer: Juniper
 model: EX2200-C-12P
 slug: juniper-ex2200-c-12p
 u_height: 1
+is_full_depth: false
 interfaces:
   - name: ge-0/0/0
     type: 1000base-t
diff --git a/device-types/Juniper/EX2200-C-12T.yaml b/device-types/Juniper/EX2200-C-12T.yaml
index 775794b52..6c044385e 100644
--- a/device-types/Juniper/EX2200-C-12T.yaml
+++ b/device-types/Juniper/EX2200-C-12T.yaml
@@ -3,6 +3,7 @@ manufacturer: Juniper
 model: EX2200-C-12T
 slug: juniper-ex2200-c-12t
 u_height: 1
+is_full_depth: false
 interfaces:
   - name: ge-0/0/0
     type: 1000base-t
diff --git a/device-types/Juniper/EX2300-C-12P.yaml b/device-types/Juniper/EX2300-C-12P.yaml
index e0557ec09..c8a8f598d 100644
--- a/device-types/Juniper/EX2300-C-12P.yaml
+++ b/device-types/Juniper/EX2300-C-12P.yaml
@@ -5,6 +5,7 @@ slug: juniper-ex2300-c-12p
 front_image: true
 rear_image: true
 u_height: 1
+is_full_depth: false
 interfaces:
   - name: ge-0/0/0
     type: 1000base-t
diff --git a/device-types/Juniper/EX2300-C-12T.yaml b/device-types/Juniper/EX2300-C-12T.yaml
index eb9d31c79..a043023f8 100644
--- a/device-types/Juniper/EX2300-C-12T.yaml
+++ b/device-types/Juniper/EX2300-C-12T.yaml
@@ -3,6 +3,7 @@ manufacturer: Juniper
 model: EX2300-C-12T
 slug: juniper-ex2300-c-12t
 u_height: 1
+is_full_depth: false
 interfaces:
   - name: ge-0/0/0
     type: 1000base-t
diff --git a/device-types/LANCOM/1793VA-4G.yaml b/device-types/LANCOM/1793VA-4G.yaml
index a9570508c..125b91f92 100644
--- a/device-types/LANCOM/1793VA-4G.yaml
+++ b/device-types/LANCOM/1793VA-4G.yaml
@@ -7,6 +7,7 @@ u_height: 0
 is_full_depth: false
 weight: 520
 weight_unit: g
+subdevice_role: child
 comments: '[LANCOM 1793VA-4G Data sheet](https://www.lancom-systems.de/download/LC-1793VA-4G/DS_1793VA-4G_DE.pdf)'
 power-ports:
   - name: PS1
diff --git a/device-types/LANCOM/1793VA.yaml b/device-types/LANCOM/1793VA.yaml
new file mode 100644
index 000000000..bbf4a262c
--- /dev/null
+++ b/device-types/LANCOM/1793VA.yaml
@@ -0,0 +1,39 @@
+---
+manufacturer: LANCOM
+model: 1793VA
+slug: lancom-1793va
+part_number: '62115'
+u_height: 0
+is_full_depth: false
+weight: 520
+weight_unit: g
+subdevice_role: child
+comments: '[LANCOM 1793VA Data sheet](https://www.lancom-systems.de/download/LC-1793VA/DS_1793VA_DE.pdf)'
+power-ports:
+  - name: PS1
+    type: dc-terminal
+    maximum_draw: 17
+interfaces:
+  - name: ETH-1
+    type: 1000base-t
+  - name: ETH-2
+    type: 1000base-t
+  - name: ETH-3
+    type: 1000base-t
+  - name: ETH-4
+    type: 1000base-t
+  - name: VDSL/ADSL
+    type: xdsl
+  - name: Analog 2/4
+    type: other
+  - name: Analog 1/3
+    type: other
+  - name: ISDN 1
+    type: 1000base-t
+  - name: ISDN 2
+    type: 1000base-t
+console-ports:
+  - name: USB
+    type: usb-a
+  - name: com
+    type: mini-din-8
diff --git a/device-types/LANCOM/1793VAW.yaml b/device-types/LANCOM/1793VAW.yaml
new file mode 100644
index 000000000..2d9f364bd
--- /dev/null
+++ b/device-types/LANCOM/1793VAW.yaml
@@ -0,0 +1,39 @@
+---
+manufacturer: LANCOM
+model: 1793VAW
+slug: lancom-1793vaw
+part_number: '62115'
+u_height: 0
+is_full_depth: false
+weight: 520
+weight_unit: g
+subdevice_role: child
+comments: '[LANCOM 1793VAW Data sheet](https://www.lancom-systems.de/download/LC-1793VAW/DS_1793VAW_DE.pdf)'
+power-ports:
+  - name: PS1
+    type: dc-terminal
+    maximum_draw: 17
+interfaces:
+  - name: ETH-1
+    type: 1000base-t
+  - name: ETH-2
+    type: 1000base-t
+  - name: ETH-3
+    type: 1000base-t
+  - name: ETH-4
+    type: 1000base-t
+  - name: VDSL/ADSL
+    type: xdsl
+  - name: Analog 2/4
+    type: other
+  - name: Analog 1/3
+    type: other
+  - name: ISDN 1
+    type: 1000base-t
+  - name: ISDN 2
+    type: 1000base-t
+console-ports:
+  - name: USB
+    type: usb-a
+  - name: com
+    type: mini-din-8
diff --git a/device-types/LANCOM/1926VAG.yaml b/device-types/LANCOM/1926VAG.yaml
new file mode 100644
index 000000000..f6efd88ad
--- /dev/null
+++ b/device-types/LANCOM/1926VAG.yaml
@@ -0,0 +1,47 @@
+---
+manufacturer: LANCOM
+model: 1926VAG
+slug: lancom-1926vag
+part_number: '62122'
+u_height: 1
+is_full_depth: false
+power-ports:
+  - name: PS1
+    type: iec-60320-c14
+    maximum_draw: 34
+interfaces:
+  - name: G.FAST/VDSL 1
+    type: xdsl
+  - name: VDSL 2
+    type: xdsl
+  - name: WAN 1 (SFP)
+    type: 1000base-x-sfp
+  - name: WAN 1
+    type: 1000base-t
+  - name: WAN 2
+    type: 1000base-t
+  - name: ETH 1
+    type: 1000base-t
+  - name: ETH 2
+    type: 1000base-t
+  - name: ETH 3
+    type: 1000base-t
+  - name: ETH 4
+    type: 1000base-t
+  - name: ANALOG 1
+    type: other
+  - name: ANALOG 2
+    type: other
+  - name: ANALOG 3
+    type: other
+  - name: ANALOG 4
+    type: other
+  - name: ISDN 1 (NT)
+    type: 1000base-t
+  - name: ISDN 2 (NT)
+    type: 1000base-t
+console-ports:
+  - name: COM
+    type: rj-45
+  - name: USB
+    type: usb-a
diff --git a/device-types/LANCOM/Rack-Mount.yaml b/device-types/LANCOM/Rack-Mount.yaml
new file mode 100644
index 000000000..ee6608ece
--- /dev/null
+++ b/device-types/LANCOM/Rack-Mount.yaml
@@ -0,0 +1,12 @@
+---
+manufacturer: LANCOM
+model: Rack Mount
+slug: lancom-rack-mount
+part_number: '61501'
+u_height: 1
+is_full_depth: false
+subdevice_role: parent
+is_powered: false
+comments: '[LANCOM Rack Mount Data sheet](https://www.lancom-systems.de/fileadmin/produkte/rack_mount/Rack-Mount_DE.pdf)'
+device-bays:
+  - name: Device
diff --git a/device-types/Netgear/GS305E.yaml b/device-types/Netgear/GS305E.yaml
new file mode 100644
index 000000000..ea7133156
--- /dev/null
+++ b/device-types/Netgear/GS305E.yaml
@@ -0,0 +1,25 @@
+---
+manufacturer: Netgear
+model: GS305E
+slug: netgear-gs305e
+u_height: 0.0
+is_full_depth: false
+airflow: passive
+comments: '[300 Series SOHO Plus (GS305E)](https://www.netgear.com/business/wired/switches/plus/gs305e/)'
+weight: 0.26
+weight_unit: kg
+power-ports:
+  - name: PS
+    type: dc-terminal
+    maximum_draw: 3
+interfaces:
+  - name: GigabitEthernet/1
+    type: 1000base-t
+  - name: GigabitEthernet/2
+    type: 1000base-t
+  - name: GigabitEthernet/3
+    type: 1000base-t
+  - name: GigabitEthernet/4
+    type: 1000base-t
+  - name: GigabitEthernet/5
+    type: 1000base-t
diff --git a/device-types/Netgear/XS708T.yaml b/device-types/Netgear/XS708T.yaml
new file mode 100644
index 000000000..56ed122b2
--- /dev/null
+++ b/device-types/Netgear/XS708T.yaml
@@ -0,0 +1,45 @@
+---
+manufacturer: Netgear
+model: XS708T
+slug: netgear-xs708t
+u_height: 1.0
+is_full_depth: false
+airflow: right-to-left
+comments: '[10-Gigabit Ethernet Smart Switches (XS7xxT)](https://www.downloads.netgear.com/files/GDC/XS708T/XS708T_XS712Tv2_XS716T_XS728T_XS748T_DS.pdf)'
+weight: 2.61
+weight_unit: kg
+power-ports:
+  - name: Power
+    type: iec-60320-c14
+    maximum_draw: 50
+interfaces:
+  - name: TenGigabitEthernet/1
+    type: 10gbase-t
+    label: '1'
+  - name: TenGigabitEthernet/2
+    type: 10gbase-t
+    label: '2'
+  - name: TenGigabitEthernet/3
+    type: 10gbase-t
+    label: '3'
+  - name: TenGigabitEthernet/4
+    type: 10gbase-t
+    label: '4'
+  - name: TenGigabitEthernet/5
+    type: 10gbase-t
+    label: '5'
+  - name: TenGigabitEthernet/6
+    type: 10gbase-t
+    label: '6'
+  - name: TenGigabitEthernet/7T
+    type: 10gbase-t
+    label: 7T
+  - name: TenGigabitEthernet/8T
+    type: 10gbase-t
+    label: 8T
+  - name: TenGigabitEthernet/7F
+    type: 10gbase-x-sfpp
+    label: 7F
+  - name: TenGigabitEthernet/8F
+    type: 10gbase-x-sfpp
+    label: 8F
diff --git a/device-types/nexconec/NGXPP01.yaml b/device-types/Nexconec/NGXPP01.yaml
similarity index 100%
rename from device-types/nexconec/NGXPP01.yaml
rename to device-types/Nexconec/NGXPP01.yaml
diff --git a/device-types/PLANET/POE-2400G.yaml b/device-types/PLANET/POE-2400G.yaml
new file mode 100644
index 000000000..343501412
--- /dev/null
+++ b/device-types/PLANET/POE-2400G.yaml
@@ -0,0 +1,162 @@
+---
+manufacturer: PLANET
+model: POE-2400G
+slug: planet-poe-2400g
+u_height: 1
+part_number: 2400G-380W
+is_full_depth: false
+description: 24-port Gigabit PoE Injector Hub with 380W power budget
+weight: 4.5
+weight_unit: kg
+comments: This device provides power and data for PoE-compliant devices.
+power-ports:
+  - name: PS1
+    type: iec-60320-c14
+    maximum_draw: 500
+interfaces:
+  - name: Management Port
+    type: 1000base-t
+  - name: Port 1 - PoE
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 1 - Internet
+    type: 1000base-t
+  - name: Port 2 - PoE
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 2 - Internet
+    type: 1000base-t
+  - name: Port 3 - PoE
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 3 - Internet
+    type: 1000base-t
+  - name: Port 4 - PoE
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 4 - Internet
+    type: 1000base-t
+  - name: Port 5 - PoE
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 5 - Internet
+    type: 1000base-t
+  - name: Port 6 - PoE
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 6 - Internet
+    type: 1000base-t
+  - name: Port 7 - PoE
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 7 - Internet
+    type: 1000base-t
+  - name: Port 8 - PoE
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 8 - Internet
+    type: 1000base-t
+  - name: Port 9 - PoE
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 9 - Internet
+    type: 1000base-t
+  - name: Port 10 - PoE
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 10 - Internet
+    type: 1000base-t
+  - name: Port 11 - PoE
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 11 - Internet
+    type: 1000base-t
+  - name: Port 12 - PoE
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 12 - Internet
+    type: 1000base-t
+  - name: Port 13 - PoE
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 13 - Internet
+    type: 1000base-t
+  - name: Port 14 - PoE
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 14 - Internet
+    type: 1000base-t
+  - name: Port 15 - PoE
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 15 - Internet
+    type: 1000base-t
+  - name: Port 16 - PoE
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 16 - Internet
+    type: 1000base-t
+  - name: Port 17 - PoE
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 17 - Internet
+    type: 1000base-t
+  - name: Port 18 - PoE
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 18 - Internet
+    type: 1000base-t
+  - name: Port 19 - PoE
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 19 - Internet
+    type: 1000base-t
+  - name: Port 20 - PoE
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 20 - Internet
+    type: 1000base-t
+  - name: Port 21 - PoE
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 21 - Internet
+    type: 1000base-t
+  - name: Port 22 - PoE
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 22 - Internet
+    type: 1000base-t
+  - name: Port 23 - POE
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 23 - Internet
+    type: 1000base-t
+  - name: Port 24 - PoE
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 24 - Internet
+    type: 1000base-t
diff --git a/device-types/Palo Alto/ION-1200-C-NA.yaml b/device-types/Palo Alto/ION-1200-C-NA.yaml
new file mode 100644
index 000000000..60dcdb547
--- /dev/null
+++ b/device-types/Palo Alto/ION-1200-C-NA.yaml	
@@ -0,0 +1,29 @@
+---
+manufacturer: Palo Alto
+model: ION 1200-C-NA
+slug: palo-alto-ion-1200-c-na
+u_height: 0
+is_full_depth: false
+subdevice_role: child
+weight: 3.75
+weight_unit: lb
+airflow: passive
+comments: '[ION models datasheet](https://www.paloaltonetworks.com/apps/pan/public/downloadResource?pagePath=/content/pan/en_US/resources/datasheets/prisma-sd-wan-instant-on-network-ion-device-specifications)'
+power-ports:
+  - name: PS1
+    type: dc-terminal
+    description: DC barrel jack
+console-ports:
+  - name: console
+    type: rj-45
+interfaces:
+  - name: Port 1
+    type: 1000base-t
+  - name: Port 2
+    type: 1000base-t
+  - name: Port 3
+    type: 1000base-t
+  - name: Port 4
+    type: 1000base-t
+  - name: Cellular
+    type: 4g
diff --git a/device-types/Palo Alto/ION-1200-C-ROW.yaml b/device-types/Palo Alto/ION-1200-C-ROW.yaml
new file mode 100644
index 000000000..92d2ab8e2
--- /dev/null
+++ b/device-types/Palo Alto/ION-1200-C-ROW.yaml	
@@ -0,0 +1,29 @@
+---
+manufacturer: Palo Alto
+model: ION 1200-C-ROW
+slug: palo-alto-ion-1200-c-row
+u_height: 0
+is_full_depth: false
+subdevice_role: child
+weight: 3.75
+weight_unit: lb
+airflow: passive
+comments: '[ION models datasheet](https://www.paloaltonetworks.com/apps/pan/public/downloadResource?pagePath=/content/pan/en_US/resources/datasheets/prisma-sd-wan-instant-on-network-ion-device-specifications)'
+power-ports:
+  - name: PS1
+    type: dc-terminal
+    description: DC barrel jack
+console-ports:
+  - name: console
+    type: rj-45
+interfaces:
+  - name: Port 1
+    type: 1000base-t
+  - name: Port 2
+    type: 1000base-t
+  - name: Port 3
+    type: 1000base-t
+  - name: Port 4
+    type: 1000base-t
+  - name: Cellular
+    type: 4g
diff --git a/device-types/Palo Alto/ION-1200-C5G-WW.yaml b/device-types/Palo Alto/ION-1200-C5G-WW.yaml
new file mode 100644
index 000000000..2523adf7d
--- /dev/null
+++ b/device-types/Palo Alto/ION-1200-C5G-WW.yaml	
@@ -0,0 +1,29 @@
+---
+manufacturer: Palo Alto
+model: ION 1200-C5G-WW
+slug: palo-alto-ion-1200-c5g-ww
+u_height: 0
+is_full_depth: false
+subdevice_role: child
+weight: 3.75
+weight_unit: lb
+airflow: passive
+comments: '[ION models datasheet](https://www.paloaltonetworks.com/apps/pan/public/downloadResource?pagePath=/content/pan/en_US/resources/datasheets/prisma-sd-wan-instant-on-network-ion-device-specifications)'
+power-ports:
+  - name: PS1
+    type: dc-terminal
+    description: DC barrel jack
+console-ports:
+  - name: console
+    type: rj-45
+interfaces:
+  - name: Port 1
+    type: 1000base-t
+  - name: Port 2
+    type: 1000base-t
+  - name: Port 3
+    type: 1000base-t
+  - name: Port 4
+    type: 1000base-t
+  - name: Cellular
+    type: 5g
diff --git a/device-types/Palo Alto/ION-1200-S-C-NA.yaml b/device-types/Palo Alto/ION-1200-S-C-NA.yaml
new file mode 100644
index 000000000..a179bbb43
--- /dev/null
+++ b/device-types/Palo Alto/ION-1200-S-C-NA.yaml	
@@ -0,0 +1,60 @@
+---
+manufacturer: Palo Alto
+model: ION 1200-S-C-NA
+slug: palo-alto-ion-1200-s-c-na
+u_height: 0
+is_full_depth: false
+subdevice_role: child
+weight: 7.85
+weight_unit: lb
+airflow: passive
+comments: '[ION models datasheet](https://www.paloaltonetworks.com/apps/pan/public/downloadResource?pagePath=/content/pan/en_US/resources/datasheets/prisma-sd-wan-instant-on-network-ion-device-specifications)'
+power-ports:
+  - name: PS1
+    type: dc-terminal
+    maximum_draw: 150
+    description: DC barrel jack
+  - name: PS2
+    type: dc-terminal
+    maximum_draw: 150
+    description: DC barrel jack
+console-ports:
+  - name: console
+    type: rj-45
+  - name: USB
+    type: usb-micro-b
+interfaces:
+  - name: Port 1
+    type: 1000base-t
+    description: Combo Port (either SFP or 1000BASE-T)
+  - name: Port 2
+    type: 1000base-t
+    description: Combo Port (either SFP or 1000BASE-T)
+  - name: Port 3
+    type: 1000base-t
+    description: Bypass pair with port 4
+  - name: Port 4
+    type: 1000base-t
+    description: Bypass pair with port 3
+  - name: Port 5
+    type: 1000base-t
+  - name: Port 6
+    type: 1000base-t
+  - name: Port 7
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Port 8
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Port 9
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Port 10
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Cellular
+    type: 4g
diff --git a/device-types/Palo Alto/ION-1200-S-C-ROW.yaml b/device-types/Palo Alto/ION-1200-S-C-ROW.yaml
new file mode 100644
index 000000000..67f91f106
--- /dev/null
+++ b/device-types/Palo Alto/ION-1200-S-C-ROW.yaml	
@@ -0,0 +1,60 @@
+---
+manufacturer: Palo Alto
+model: ION 1200-S-C-ROW
+slug: palo-alto-ion-1200-s-c-row
+u_height: 0
+is_full_depth: false
+subdevice_role: child
+weight: 7.85
+weight_unit: lb
+airflow: passive
+comments: '[ION models datasheet](https://www.paloaltonetworks.com/apps/pan/public/downloadResource?pagePath=/content/pan/en_US/resources/datasheets/prisma-sd-wan-instant-on-network-ion-device-specifications)'
+power-ports:
+  - name: PS1
+    type: dc-terminal
+    maximum_draw: 150
+    description: DC barrel jack
+  - name: PS2
+    type: dc-terminal
+    maximum_draw: 150
+    description: DC barrel jack
+console-ports:
+  - name: console
+    type: rj-45
+  - name: USB
+    type: usb-micro-b
+interfaces:
+  - name: Port 1
+    type: 1000base-t
+    description: Combo Port (either SFP or 1000BASE-T)
+  - name: Port 2
+    type: 1000base-t
+    description: Combo Port (either SFP or 1000BASE-T)
+  - name: Port 3
+    type: 1000base-t
+    description: Bypass pair with port 4
+  - name: Port 4
+    type: 1000base-t
+    description: Bypass pair with port 3
+  - name: Port 5
+    type: 1000base-t
+  - name: Port 6
+    type: 1000base-t
+  - name: Port 7
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Port 8
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Port 9
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Port 10
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Cellular
+    type: 4g
diff --git a/device-types/Palo Alto/ION-1200-S-C5G-WW.yaml b/device-types/Palo Alto/ION-1200-S-C5G-WW.yaml
new file mode 100644
index 000000000..dda499df1
--- /dev/null
+++ b/device-types/Palo Alto/ION-1200-S-C5G-WW.yaml	
@@ -0,0 +1,60 @@
+---
+manufacturer: Palo Alto
+model: ION 1200-S-C5G-WW
+slug: palo-alto-ion-1200-s-c5g-ww
+u_height: 0
+is_full_depth: false
+subdevice_role: child
+weight: 7.85
+weight_unit: lb
+airflow: passive
+comments: '[ION models datasheet](https://www.paloaltonetworks.com/apps/pan/public/downloadResource?pagePath=/content/pan/en_US/resources/datasheets/prisma-sd-wan-instant-on-network-ion-device-specifications)'
+power-ports:
+  - name: PS1
+    type: dc-terminal
+    maximum_draw: 150
+    description: DC barrel jack
+  - name: PS2
+    type: dc-terminal
+    maximum_draw: 150
+    description: DC barrel jack
+console-ports:
+  - name: console
+    type: rj-45
+  - name: USB
+    type: usb-micro-b
+interfaces:
+  - name: Port 1
+    type: 1000base-t
+    description: Combo Port (either SFP or 1000BASE-T)
+  - name: Port 2
+    type: 1000base-t
+    description: Combo Port (either SFP or 1000BASE-T)
+  - name: Port 3
+    type: 1000base-t
+    description: Bypass pair with port 4
+  - name: Port 4
+    type: 1000base-t
+    description: Bypass pair with port 3
+  - name: Port 5
+    type: 1000base-t
+  - name: Port 6
+    type: 1000base-t
+  - name: Port 7
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Port 8
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Port 9
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Port 10
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Cellular
+    type: 5g
diff --git a/device-types/Palo Alto/ION-1200-S.yaml b/device-types/Palo Alto/ION-1200-S.yaml
new file mode 100644
index 000000000..64090ca83
--- /dev/null
+++ b/device-types/Palo Alto/ION-1200-S.yaml	
@@ -0,0 +1,58 @@
+---
+manufacturer: Palo Alto
+model: ION 1200-S
+slug: palo-alto-ion-1200-s
+u_height: 0
+is_full_depth: false
+subdevice_role: child
+weight: 7.85
+weight_unit: lb
+airflow: passive
+comments: '[ION models datasheet](https://www.paloaltonetworks.com/apps/pan/public/downloadResource?pagePath=/content/pan/en_US/resources/datasheets/prisma-sd-wan-instant-on-network-ion-device-specifications)'
+power-ports:
+  - name: PS1
+    type: dc-terminal
+    maximum_draw: 150
+    description: DC barrel jack
+  - name: PS2
+    type: dc-terminal
+    maximum_draw: 150
+    description: DC barrel jack
+console-ports:
+  - name: console
+    type: rj-45
+  - name: USB
+    type: usb-micro-b
+interfaces:
+  - name: Port 1
+    type: 1000base-t
+    description: Combo Port (either SFP or 1000BASE-T)
+  - name: Port 2
+    type: 1000base-t
+    description: Combo Port (either SFP or 1000BASE-T)
+  - name: Port 3
+    type: 1000base-t
+    description: Bypass pair with port 4
+  - name: Port 4
+    type: 1000base-t
+    description: Bypass pair with port 3
+  - name: Port 5
+    type: 1000base-t
+  - name: Port 6
+    type: 1000base-t
+  - name: Port 7
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Port 8
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Port 9
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Port 10
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
diff --git a/device-types/Palo Alto/ION-1200.yaml b/device-types/Palo Alto/ION-1200.yaml
new file mode 100644
index 000000000..50e98c4be
--- /dev/null
+++ b/device-types/Palo Alto/ION-1200.yaml	
@@ -0,0 +1,27 @@
+---
+manufacturer: Palo Alto
+model: ION 1200
+slug: palo-alto-ion-1200
+u_height: 0
+is_full_depth: false
+subdevice_role: child
+weight: 3.75
+weight_unit: lb
+airflow: passive
+comments: '[ION models datasheet](https://www.paloaltonetworks.com/apps/pan/public/downloadResource?pagePath=/content/pan/en_US/resources/datasheets/prisma-sd-wan-instant-on-network-ion-device-specifications)'
+power-ports:
+  - name: PS1
+    type: dc-terminal
+    description: DC barrel jack
+console-ports:
+  - name: console
+    type: rj-45
+interfaces:
+  - name: Port 1
+    type: 1000base-t
+  - name: Port 2
+    type: 1000base-t
+  - name: Port 3
+    type: 1000base-t
+  - name: Port 4
+    type: 1000base-t
diff --git a/device-types/Palo Alto/ION-3200.yaml b/device-types/Palo Alto/ION-3200.yaml
new file mode 100644
index 000000000..1d1a53cc3
--- /dev/null
+++ b/device-types/Palo Alto/ION-3200.yaml	
@@ -0,0 +1,58 @@
+---
+manufacturer: Palo Alto
+model: ION 3200
+slug: palo-alto-ion-3200
+u_height: 0
+is_full_depth: false
+subdevice_role: child
+weight: 8.7
+weight_unit: lb
+airflow: passive
+comments: '[ION models datasheet](https://www.paloaltonetworks.com/apps/pan/public/downloadResource?pagePath=/content/pan/en_US/resources/datasheets/prisma-sd-wan-instant-on-network-ion-device-specifications)'
+power-ports:
+  - name: PS1
+    type: dc-terminal
+    maximum_draw: 150
+    description: DC barrel jack
+  - name: PS2
+    type: dc-terminal
+    maximum_draw: 150
+    description: DC barrel jack
+console-ports:
+  - name: console
+    type: rj-45
+  - name: USB
+    type: usb-micro-b
+interfaces:
+  - name: Port 1
+    type: 1000base-t
+    description: Combo Port (either SFP or 1000BASE-T)
+  - name: Port 2
+    type: 1000base-t
+    description: Combo Port (either SFP or 1000BASE-T)
+  - name: Port 3
+    type: 1000base-t
+    description: Bypass pair with port 4
+  - name: Port 4
+    type: 1000base-t
+    description: Bypass pair with port 3
+  - name: Port 5
+    type: 1000base-t
+  - name: Port 6
+    type: 1000base-t
+  - name: Port 7
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Port 8
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Port 9
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Port 10
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
diff --git a/device-types/Palo Alto/ION-9000.yaml b/device-types/Palo Alto/ION-9000.yaml
new file mode 100644
index 000000000..0cdfa12e2
--- /dev/null
+++ b/device-types/Palo Alto/ION-9000.yaml	
@@ -0,0 +1,65 @@
+---
+manufacturer: Palo Alto
+model: ION 9000
+slug: palo-alto-ion-9000
+u_height: 1
+is_full_depth: true
+weight: 21.38
+weight_unit: lb
+airflow: front-to-rear
+comments: '[ION 9000 specifications](https://docs.paloaltonetworks.com/hardware/ion-9000-hardware-reference/ion-9000-overview/ion-9000-device-specifications)'
+power-ports:
+  - name: PS1
+    type: iec-60320-c14
+    maximum_draw: 450
+  - name: PS2
+    type: iec-60320-c14
+    maximum_draw: 450
+console-ports:
+  - name: AUX
+    type: rj-45
+interfaces:
+  - name: Controller 1
+    type: 1000base-t
+  - name: Controller 2
+    type: 1000base-t
+  - name: Port 1
+    type: 1000base-t
+    description: Bypass pair with port 2
+  - name: Port 2
+    type: 1000base-t
+    description: Bypass pair with port 1
+  - name: Port 3
+    type: 1000base-t
+    description: Bypass pair with port 4
+  - name: Port 4
+    type: 1000base-t
+    description: Bypass pair with port 3
+  - name: Port 5
+    type: 1000base-t
+    description: Bypass pair with port 6
+  - name: Port 6
+    type: 1000base-t
+    description: Bypass pair with port 5
+  - name: Port 7
+    type: 1000base-t
+    description: Bypass pair with port 8
+  - name: Port 8
+    type: 1000base-t
+    description: Bypass pair with port 7
+  - name: Port 9
+    type: 10gbase-x-sfpp
+  - name: Port 10
+    type: 10gbase-x-sfpp
+  - name: Port 11
+    type: 10gbase-x-sfpp
+  - name: Port 12
+    type: 10gbase-x-sfpp
+  - name: Port 13
+    type: 10gbase-x-sfpp
+  - name: Port 14
+    type: 10gbase-x-sfpp
+  - name: Port 15
+    type: 10gbase-x-sfpp
+  - name: Port 16
+    type: 10gbase-x-sfpp
diff --git a/device-types/Palo Alto/ION-9200.yaml b/device-types/Palo Alto/ION-9200.yaml
new file mode 100644
index 000000000..0af2ddd55
--- /dev/null
+++ b/device-types/Palo Alto/ION-9200.yaml	
@@ -0,0 +1,81 @@
+---
+manufacturer: Palo Alto
+model: ION 9200
+slug: palo-alto-ion-9200
+u_height: 1
+is_full_depth: true
+weight: 15.5
+weight_unit: lb
+airflow: front-to-rear
+comments: '[ION 9000 specifications](https://docs.paloaltonetworks.com/hardware/ion-9000-hardware-reference/ion-9000-overview/ion-9000-device-specifications)'
+power-ports:
+  - name: PS1
+    type: iec-60320-c14
+    maximum_draw: 450
+  - name: PS2
+    type: iec-60320-c14
+    maximum_draw: 450
+console-ports:
+  - name: console
+    type: rj-45
+  - name: usb-console
+    type: usb-micro-a
+interfaces:
+  - name: Port 1
+    type: 1000base-t
+    description: Bypass pair with port 2
+  - name: Port 2
+    type: 1000base-t
+    description: Bypass pair with port 1
+  - name: Port 3
+    type: 1000base-t
+    description: Bypass pair with port 4
+  - name: Port 4
+    type: 1000base-t
+    description: Bypass pair with port 3
+  - name: Port 5
+    type: 1000base-t
+    description: Bypass pair with port 6
+  - name: Port 6
+    type: 1000base-t
+    description: Bypass pair with port 5
+  - name: Port 7
+    type: 1000base-t
+    description: Bypass pair with port 8
+  - name: Port 8
+    type: 1000base-t
+    description: Bypass pair with port 7
+  - name: Port 9
+    type: 5gbase-t
+  - name: Port 10
+    type: 5gbase-t
+  - name: Port 11
+    type: 5gbase-t
+  - name: Port 12
+    type: 5gbase-t
+  - name: Port 13
+    type: 10gbase-x-sfpp
+  - name: Port 14
+    type: 10gbase-x-sfpp
+  - name: Port 15
+    type: 10gbase-x-sfpp
+  - name: Port 16
+    type: 10gbase-x-sfpp
+  - name: Port 17
+    type: 10gbase-x-sfpp
+  - name: Port 18
+    type: 10gbase-x-sfpp
+  - name: Port 19
+    type: 10gbase-x-sfpp
+  - name: Port 20
+    type: 10gbase-x-sfpp
+  - name: Port 21
+    type: 10gbase-x-sfpp
+  - name: Port 22
+    type: 10gbase-x-sfpp
+  - name: Port 23
+    type: 1000base-t
+  - name: Port 24
+    type: 1000base-t
+  - name: Port 25
+    type: 1000base-t
diff --git a/device-types/Palo Alto/PA-410.yaml b/device-types/Palo Alto/PA-410.yaml
index 66e174d2a..b458c1b88 100644
--- a/device-types/Palo Alto/PA-410.yaml	
+++ b/device-types/Palo Alto/PA-410.yaml	
@@ -3,12 +3,13 @@ manufacturer: Palo Alto
 model: PA-410
 slug: palo-alto-pa-410
 part_number: PA-410
-u_height: 1
+u_height: 0
+subdevice_role: child
 is_full_depth: false
 weight: 3.1
 weight_unit: lb
 airflow: passive
-comments: '[Product Summary Specsheet - PAN-OS 10.1](https://www.paloaltonetworks.com/resources/datasheets/palo-alto-networks-product-summary-specsheet-pan-os-10-1)'
+comments: '[PA-400 series datasheet](https://www.paloaltonetworks.com/apps/pan/public/downloadResource?pagePath=/content/pan/en_US/resources/datasheets/pa-400-series)'
 power-ports:
   - name: PS1
     type: dc-terminal
diff --git a/device-types/Palo Alto/PA-415-5G.yaml b/device-types/Palo Alto/PA-415-5G.yaml
new file mode 100644
index 000000000..f25d91868
--- /dev/null
+++ b/device-types/Palo Alto/PA-415-5G.yaml	
@@ -0,0 +1,62 @@
+---
+manufacturer: Palo Alto
+model: PA-415-5G
+slug: palo-alto-pa-415-5g
+part_number: PA-415-5G
+u_height: 0
+subdevice_role: child
+is_full_depth: false
+weight: 7.85
+weight_unit: lb
+airflow: passive
+comments: '[PA-400 series datasheet](https://www.paloaltonetworks.com/apps/pan/public/downloadResource?pagePath=/content/pan/en_US/resources/datasheets/pa-400-series)'
+power-ports:
+  - name: PS1
+    type: dc-terminal
+    maximum_draw: 150
+    description: DC barrel jack
+  - name: PS2
+    type: dc-terminal
+    maximum_draw: 150
+    description: DC barrel jack
+console-ports:
+  - name: console
+    type: rj-45
+  - name: USB
+    type: usb-micro-b
+interfaces:
+  - name: management
+    type: 1000base-t
+    mgmt_only: true
+    description: Combo Port (either SFP or 1000BASE-T)
+  - name: ethernet1/1
+    type: 1000base-t
+    description: Combo Port (either SFP or 1000BASE-T)
+  - name: ethernet1/2
+    type: 1000base-t
+  - name: ethernet1/3
+    type: 1000base-t
+  - name: ethernet1/4
+    type: 1000base-t
+  - name: ethernet1/5
+    type: 1000base-t
+  - name: ethernet1/6
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: ethernet1/7
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: ethernet1/8
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: ethernet1/9
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: cellular1/1
+    type: 5g
+  - name: loopback
+    type: virtual
diff --git a/device-types/Palo Alto/PA-415.yaml b/device-types/Palo Alto/PA-415.yaml
new file mode 100644
index 000000000..a8c8feabb
--- /dev/null
+++ b/device-types/Palo Alto/PA-415.yaml	
@@ -0,0 +1,60 @@
+---
+manufacturer: Palo Alto
+model: PA-415
+slug: palo-alto-pa-415
+part_number: PA-415
+u_height: 0
+subdevice_role: child
+is_full_depth: false
+weight: 7.85
+weight_unit: lb
+airflow: passive
+comments: '[PA-400 series datasheet](https://www.paloaltonetworks.com/apps/pan/public/downloadResource?pagePath=/content/pan/en_US/resources/datasheets/pa-400-series)'
+power-ports:
+  - name: PS1
+    type: dc-terminal
+    maximum_draw: 150
+    description: DC barrel jack
+  - name: PS2
+    type: dc-terminal
+    maximum_draw: 150
+    description: DC barrel jack
+console-ports:
+  - name: console
+    type: rj-45
+  - name: USB
+    type: usb-micro-b
+interfaces:
+  - name: management
+    type: 1000base-t
+    mgmt_only: true
+    description: Combo Port (either SFP or 1000BASE-T)
+  - name: ethernet1/1
+    type: 1000base-t
+    description: Combo Port (either SFP or 1000BASE-T)
+  - name: ethernet1/2
+    type: 1000base-t
+  - name: ethernet1/3
+    type: 1000base-t
+  - name: ethernet1/4
+    type: 1000base-t
+  - name: ethernet1/5
+    type: 1000base-t
+  - name: ethernet1/6
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: ethernet1/7
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: ethernet1/8
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: ethernet1/9
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: loopback
+    type: virtual
diff --git a/device-types/Palo Alto/PA-440.yaml b/device-types/Palo Alto/PA-440.yaml
index 475b7ccf2..87667a5ba 100644
--- a/device-types/Palo Alto/PA-440.yaml	
+++ b/device-types/Palo Alto/PA-440.yaml	
@@ -3,14 +3,15 @@ manufacturer: Palo Alto
 model: PA-440
 slug: palo-alto-pa-440
 part_number: PA-440
-u_height: 1
+u_height: 0
+subdevice_role: child
 is_full_depth: false
 weight: 5
 weight_unit: lb
 airflow: passive
 front_image: true
 rear_image: true
-comments: '[Product Summary Specsheet - PAN-OS 10.1](https://www.paloaltonetworks.com/resources/datasheets/palo-alto-networks-product-summary-specsheet-pan-os-10-1)'
+comments: '[PA-400 series datasheet](https://www.paloaltonetworks.com/apps/pan/public/downloadResource?pagePath=/content/pan/en_US/resources/datasheets/pa-400-series)'
 power-ports:
   - name: PS1
     type: dc-terminal
diff --git a/device-types/Palo Alto/PA-445.yaml b/device-types/Palo Alto/PA-445.yaml
new file mode 100644
index 000000000..690a60b74
--- /dev/null
+++ b/device-types/Palo Alto/PA-445.yaml	
@@ -0,0 +1,60 @@
+---
+manufacturer: Palo Alto
+model: PA-445
+slug: palo-alto-pa-445
+part_number: PA-445
+u_height: 0
+subdevice_role: child
+is_full_depth: false
+weight: 8.7
+weight_unit: lb
+airflow: passive
+comments: '[PA-400 series datasheet](https://www.paloaltonetworks.com/apps/pan/public/downloadResource?pagePath=/content/pan/en_US/resources/datasheets/pa-400-series)'
+power-ports:
+  - name: PS1
+    type: dc-terminal
+    maximum_draw: 150
+    description: DC barrel jack
+  - name: PS2
+    type: dc-terminal
+    maximum_draw: 150
+    description: DC barrel jack
+console-ports:
+  - name: console
+    type: rj-45
+  - name: USB
+    type: usb-micro-b
+interfaces:
+  - name: management
+    type: 1000base-t
+    mgmt_only: true
+    description: Combo Port (either SFP or 1000BASE-T)
+  - name: ethernet1/1
+    type: 1000base-t
+    description: Combo Port (either SFP or 1000BASE-T)
+  - name: ethernet1/2
+    type: 1000base-t
+  - name: ethernet1/3
+    type: 1000base-t
+  - name: ethernet1/4
+    type: 1000base-t
+  - name: ethernet1/5
+    type: 1000base-t
+  - name: ethernet1/6
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: ethernet1/7
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: ethernet1/8
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: ethernet1/9
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: loopback
+    type: virtual
diff --git a/device-types/Palo Alto/PA-450.yaml b/device-types/Palo Alto/PA-450.yaml
index c38b23079..bce2f4d3c 100644
--- a/device-types/Palo Alto/PA-450.yaml	
+++ b/device-types/Palo Alto/PA-450.yaml	
@@ -3,14 +3,15 @@ manufacturer: Palo Alto
 model: PA-450
 slug: palo-alto-pa-450
 part_number: PA-450
-u_height: 1
+u_height: 0
+subdevice_role: child
 is_full_depth: false
 weight: 5
 weight_unit: lb
 airflow: passive
 front_image: true
 rear_image: true
-comments: '[Product Summary Specsheet - PAN-OS 10.1](https://www.paloaltonetworks.com/resources/datasheets/palo-alto-networks-product-summary-specsheet-pan-os-10-1)'
+comments: '[PA-400 series datasheet](https://www.paloaltonetworks.com/apps/pan/public/downloadResource?pagePath=/content/pan/en_US/resources/datasheets/pa-400-series)'
 power-ports:
   - name: PS1
     type: dc-terminal
diff --git a/device-types/Palo Alto/PA-455-5G.yaml b/device-types/Palo Alto/PA-455-5G.yaml
new file mode 100644
index 000000000..19e11bfc4
--- /dev/null
+++ b/device-types/Palo Alto/PA-455-5G.yaml	
@@ -0,0 +1,60 @@
+---
+manufacturer: Palo Alto
+model: PA-455-5G
+slug: palo-alto-pa-455-5g
+part_number: PA-455-5G
+u_height: 0
+subdevice_role: child
+is_full_depth: false
+weight: 9
+weight_unit: lb
+airflow: passive
+comments: '[PA-400 series datasheet](https://www.paloaltonetworks.com/apps/pan/public/downloadResource?pagePath=/content/pan/en_US/resources/datasheets/pa-400-series)'
+power-ports:
+  - name: PS1
+    type: dc-terminal
+    maximum_draw: 150
+    description: DC barrel jack
+  - name: PS2
+    type: dc-terminal
+    maximum_draw: 150
+    description: DC barrel jack
+console-ports:
+  - name: console
+    type: rj-45
+  - name: USB
+    type: usb-micro-b
+interfaces:
+  - name: management
+    type: 1000base-t
+    mgmt_only: true
+  - name: ethernet1/1
+    type: 1000base-t
+    description: Combo Port (either SFP or 1000BASE-T)
+  - name: ethernet1/2
+    description: Combo Port (either SFP or 1000BASE-T)
+    type: 1000base-t
+  - name: ethernet1/3
+    type: 1000base-t
+  - name: ethernet1/4
+    type: 1000base-t
+  - name: ethernet1/5
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: ethernet1/6
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: ethernet1/7
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: ethernet1/8
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: cellular1/1
+    type: 5g
+  - name: loopback
+    type: virtual
diff --git a/device-types/Palo Alto/PA-455.yaml b/device-types/Palo Alto/PA-455.yaml
new file mode 100644
index 000000000..17861699a
--- /dev/null
+++ b/device-types/Palo Alto/PA-455.yaml	
@@ -0,0 +1,58 @@
+---
+manufacturer: Palo Alto
+model: PA-455
+slug: palo-alto-pa-455
+part_number: PA-455
+u_height: 0
+subdevice_role: child
+is_full_depth: false
+weight: 9.8
+weight_unit: lb
+airflow: passive
+comments: '[PA-400 series datasheet](https://www.paloaltonetworks.com/apps/pan/public/downloadResource?pagePath=/content/pan/en_US/resources/datasheets/pa-400-series)'
+power-ports:
+  - name: PS1
+    type: dc-terminal
+    maximum_draw: 150
+    description: DC barrel jack
+  - name: PS2
+    type: dc-terminal
+    maximum_draw: 150
+    description: DC barrel jack
+console-ports:
+  - name: console
+    type: rj-45
+  - name: USB
+    type: usb-micro-b
+interfaces:
+  - name: management
+    type: 1000base-t
+    mgmt_only: true
+  - name: ethernet1/1
+    type: 1000base-t
+    description: Combo Port (either SFP or 1000BASE-T)
+  - name: ethernet1/2
+    description: Combo Port (either SFP or 1000BASE-T)
+    type: 1000base-t
+  - name: ethernet1/3
+    type: 1000base-t
+  - name: ethernet1/4
+    type: 1000base-t
+  - name: ethernet1/5
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: ethernet1/6
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: ethernet1/7
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: ethernet1/8
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: loopback
+    type: virtual
diff --git a/device-types/Palo Alto/PA-460.yaml b/device-types/Palo Alto/PA-460.yaml
index f2dd46d3c..6ec351e7a 100644
--- a/device-types/Palo Alto/PA-460.yaml	
+++ b/device-types/Palo Alto/PA-460.yaml	
@@ -3,14 +3,15 @@ manufacturer: Palo Alto
 model: PA-460
 slug: palo-alto-pa-460
 part_number: PA-460
-u_height: 1
+u_height: 0
+subdevice_role: child
 is_full_depth: false
 weight: 5
 weight_unit: lb
 airflow: passive
 front_image: true
 rear_image: true
-comments: '[Product Summary Specsheet - PAN-OS 10.1](https://www.paloaltonetworks.com/resources/datasheets/palo-alto-networks-product-summary-specsheet-pan-os-10-1)'
+comments: '[PA-400 series datasheet](https://www.paloaltonetworks.com/apps/pan/public/downloadResource?pagePath=/content/pan/en_US/resources/datasheets/pa-400-series)'
 power-ports:
   - name: PS1
     type: dc-terminal
diff --git a/device-types/Palo Alto/PAN-1RU-RGD-RACK-KIT-4POST.yaml b/device-types/Palo Alto/PAN-1RU-RGD-RACK-KIT-4POST.yaml
new file mode 100644
index 000000000..e74ac2aae
--- /dev/null
+++ b/device-types/Palo Alto/PAN-1RU-RGD-RACK-KIT-4POST.yaml	
@@ -0,0 +1,13 @@
+---
+manufacturer: Palo Alto
+model: PAN-1RU-RGD-RACK-KIT-4POST
+slug: palo-alto-pan-1ru-rgd-rack-kit-4post
+part_number: PAN-1RU-RGD-RACK-KIT-4POST
+u_height: 1
+subdevice_role: parent
+is_full_depth: true
+is_powered: false
+airflow: passive
+comments: Holds one PA-415-5G firewall in a four-post rack.
+device-bays:
+  - name: Firewall
diff --git a/device-types/Palo Alto/PAN-1RU-SMALL-RACK4.yaml b/device-types/Palo Alto/PAN-1RU-SMALL-RACK4.yaml
new file mode 100644
index 000000000..56dc33f99
--- /dev/null
+++ b/device-types/Palo Alto/PAN-1RU-SMALL-RACK4.yaml	
@@ -0,0 +1,13 @@
+---
+manufacturer: Palo Alto
+model: PAN-1RU-SMALL-RACK4
+slug: palo-alto-pan-1ru-small-rack4
+part_number: PAN-1RU-SMALL-RACK4
+u_height: 1
+subdevice_role: parent
+is_full_depth: true
+is_powered: false
+airflow: passive
+comments: Holds one PA-455 or PA-455-5G firewall in a four-post rack.
+device-bays:
+  - name: Firewall
diff --git a/device-types/Palo Alto/PAN-ION-1200-C5G-RACKTRAY.yaml b/device-types/Palo Alto/PAN-ION-1200-C5G-RACKTRAY.yaml
new file mode 100644
index 000000000..05f0724d5
--- /dev/null
+++ b/device-types/Palo Alto/PAN-ION-1200-C5G-RACKTRAY.yaml	
@@ -0,0 +1,12 @@
+---
+manufacturer: Palo Alto
+model: PAN-ION-1200-C5G-RACKTRAY
+slug: palo-alto-pan-ion-1200-c5g-racktray
+u_height: 1
+subdevice_role: parent
+is_full_depth: true
+is_powered: false
+airflow: passive
+comments: Holds one cellular variant of an ION 1200 device in a four-post rack.
+device-bays:
+  - name: ION device
diff --git a/device-types/Palo Alto/PAN-ION-1200-RACKTRAY.yaml b/device-types/Palo Alto/PAN-ION-1200-RACKTRAY.yaml
new file mode 100644
index 000000000..c1c4470b0
--- /dev/null
+++ b/device-types/Palo Alto/PAN-ION-1200-RACKTRAY.yaml	
@@ -0,0 +1,12 @@
+---
+manufacturer: Palo Alto
+model: PAN-ION-1200-RACKTRAY
+slug: palo-alto-pan-ion-1200-racktray
+u_height: 1
+subdevice_role: parent
+is_full_depth: true
+is_powered: false
+airflow: passive
+comments: Holds one non-cellular ION 1200 device in a four-post rack.
+device-bays:
+  - name: ION device
diff --git a/device-types/Palo Alto/PAN-ION-RACKTRAY-1200-S-C.yaml b/device-types/Palo Alto/PAN-ION-RACKTRAY-1200-S-C.yaml
new file mode 100644
index 000000000..efdd44095
--- /dev/null
+++ b/device-types/Palo Alto/PAN-ION-RACKTRAY-1200-S-C.yaml	
@@ -0,0 +1,12 @@
+---
+manufacturer: Palo Alto
+model: PAN-ION-RACKTRAY-1200-S-C
+slug: palo-alto-pan-ion-racktray-1200-s-c
+u_height: 1
+subdevice_role: parent
+is_full_depth: true
+is_powered: false
+airflow: passive
+comments: Holds one 4G variant of an ION 1200 or ION 1200-S device in a four-post rack.
+device-bays:
+  - name: ION device
diff --git a/device-types/Palo Alto/PAN-ION-RACKTRAY-1200-S-C5G.yaml b/device-types/Palo Alto/PAN-ION-RACKTRAY-1200-S-C5G.yaml
new file mode 100644
index 000000000..699bc7dbf
--- /dev/null
+++ b/device-types/Palo Alto/PAN-ION-RACKTRAY-1200-S-C5G.yaml	
@@ -0,0 +1,12 @@
+---
+manufacturer: Palo Alto
+model: PAN-ION-RACKTRAY-1200-S-C5G
+slug: palo-alto-pan-ion-racktray-1200-s-c5g
+u_height: 1
+subdevice_role: parent
+is_full_depth: true
+is_powered: false
+airflow: passive
+comments: Holds one non-cellular or 5G variant of an ION 1200 or 1200-S device in a four-post rack.
+device-bays:
+  - name: ION device
diff --git a/device-types/Palo Alto/PAN-ION-RACKTRAY-3200.yaml b/device-types/Palo Alto/PAN-ION-RACKTRAY-3200.yaml
new file mode 100644
index 000000000..43d5bf953
--- /dev/null
+++ b/device-types/Palo Alto/PAN-ION-RACKTRAY-3200.yaml	
@@ -0,0 +1,12 @@
+---
+manufacturer: Palo Alto
+model: PAN-ION-RACKTRAY-3200
+slug: palo-alto-pan-ion-racktray-3200
+u_height: 1
+subdevice_role: parent
+is_full_depth: true
+is_powered: false
+airflow: passive
+comments: Holds one ION 3200 device in a four-post rack.
+device-bays:
+  - name: ION device
diff --git a/device-types/Palo Alto/PAN-PA-400-POE-RACKTRAY.yaml b/device-types/Palo Alto/PAN-PA-400-POE-RACKTRAY.yaml
new file mode 100644
index 000000000..565892679
--- /dev/null
+++ b/device-types/Palo Alto/PAN-PA-400-POE-RACKTRAY.yaml	
@@ -0,0 +1,13 @@
+---
+manufacturer: Palo Alto
+model: PAN-PA-400-POE-RACKTRAY
+slug: palo-alto-pan-pa-400-poe-racktray
+part_number: PAN-PA-400-POE-RACKTRAY
+u_height: 1
+subdevice_role: parent
+is_full_depth: true
+is_powered: false
+airflow: passive
+comments: Holds one PA-415 or PA-445 firewall in a four-post rack.
+device-bays:
+  - name: Firewall
diff --git a/device-types/Palo Alto/PAN-PA-400-RACKTRAY.yaml b/device-types/Palo Alto/PAN-PA-400-RACKTRAY.yaml
new file mode 100644
index 000000000..9dcdf58cc
--- /dev/null
+++ b/device-types/Palo Alto/PAN-PA-400-RACKTRAY.yaml	
@@ -0,0 +1,14 @@
+---
+manufacturer: Palo Alto
+model: PAN-PA-400-RACKTRAY
+slug: palo-alto-pan-pa-400-racktray
+part_number: PAN-PA-400-RACKTRAY
+u_height: 1
+subdevice_role: parent
+is_full_depth: true
+is_powered: false
+airflow: passive
+comments: Holds one or two PA-440, PA-450, or PA-460 firewalls in a four-post rack.
+device-bays:
+  - name: Firewall A
+  - name: Firewall B
diff --git a/device-types/Panduit/DP245E88TGY.yaml b/device-types/Panduit/DP245E88TGY.yaml
index 963dfa186..17dfb78bd 100644
--- a/device-types/Panduit/DP245E88TGY.yaml
+++ b/device-types/Panduit/DP245E88TGY.yaml
@@ -1,6 +1,6 @@
 ---
 manufacturer: Panduit
-model: DP5e Flat Cat 5e Punchdown Patch Panel 48 Ports, 1RU, Black
+model: DP5e Flat Cat 5e Punchdown Patch Panel 24 Ports, 1RU, Black
 slug: panduit-dp245e88tgy
 part_number: DP245E88TGY
 u_height: 1
diff --git a/device-types/QNAP/TS-431U.yaml b/device-types/QNAP/TS-431U.yaml
new file mode 100644
index 000000000..abcbccfe1
--- /dev/null
+++ b/device-types/QNAP/TS-431U.yaml
@@ -0,0 +1,21 @@
+---
+manufacturer: QNAP
+model: TS-431U
+slug: qnap-ts-431u
+part_number: TS-431U
+is_full_depth: false
+airflow: side-to-rear
+comments: '[TS-431U | Hardware Specs | QNAP](https://www.qnap.com/de-de/product/ts-431u/specs/hardware)'
+weight: 9.26
+weight_unit: kg
+u_height: 1
+power-ports:
+  - name: Power
+    type: iec-60320-c14
+    maximum_draw: 250
+    allocated_draw: 35
+interfaces:
+  - name: eth0
+    type: 1000base-t
+  - name: eth1
+    type: 1000base-t
diff --git a/device-types/QTECH/QSW-6900-56F.yaml b/device-types/QTECH/QSW-6900-56F.yaml
index 19f10a8a2..7f7a4b206 100644
--- a/device-types/QTECH/QSW-6900-56F.yaml
+++ b/device-types/QTECH/QSW-6900-56F.yaml
@@ -1,197 +1,251 @@
 ---
 manufacturer: QTECH
 model: QSW-6900-56F
-part_number: QSW-6900-56F
 slug: qtech-qsw-6900-56f
-u_height: 1
-is_full_depth: false
+part_number: QSW-6900-56F
+u_height: 1.0
 airflow: front-to-rear
-weight: 8
+weight: 8.0
 weight_unit: kg
 comments: '[QTECH QSW-6900-56F](https://ftp.qtech.ru/Switch/Data%20Center/QSW-6900/Manual/Installation%20Guide%20%5bEng%5d/QSW-6900-56F%20Installation%20Manual_Eng.pdf)'
 console-ports:
   - name: console
     label: Console
     type: rj-45
-power-ports:
-  - name: PSU1
-    type: iec-60320-c14
-    maximum_draw: 550
-    allocated_draw: 300
-  - name: PSU2
-    type: iec-60320-c14
-    maximum_draw: 550
-    allocated_draw: 300
 interfaces:
-  - name: TFGigabitEthernet 0/1
-    type: 25gbase-x-sfp28
-    label: 1F
-  - name: TFGigabitEthernet 0/2
-    type: 25gbase-x-sfp28
-    label: 2F
-  - name: TFGigabitEthernet 0/3
-    type: 25gbase-x-sfp28
-    label: 3F
-  - name: TFGigabitEthernet 0/4
-    type: 25gbase-x-sfp28
-    label: 4F
-  - name: TFGigabitEthernet 0/5
-    type: 25gbase-x-sfp28
-    label: 5F
-  - name: TFGigabitEthernet 0/6
-    type: 25gbase-x-sfp28
-    label: 6F
-  - name: TFGigabitEthernet 0/7
-    type: 25gbase-x-sfp28
-    label: 7F
-  - name: TFGigabitEthernet 0/8
-    type: 25gbase-x-sfp28
-    label: 8F
-  - name: TFGigabitEthernet 0/9
-    type: 25gbase-x-sfp28
-    label: 9F
-  - name: TFGigabitEthernet 0/10
-    type: 25gbase-x-sfp28
-    label: 10F
-  - name: TFGigabitEthernet 0/11
-    type: 25gbase-x-sfp28
-    label: 11F
-  - name: TFGigabitEthernet 0/12
-    type: 25gbase-x-sfp28
-    label: 12F
-  - name: TFGigabitEthernet 0/13
-    type: 25gbase-x-sfp28
-    label: 13F
-  - name: TFGigabitEthernet 0/14
-    type: 25gbase-x-sfp28
-    label: 14F
-  - name: TFGigabitEthernet 0/15
-    type: 25gbase-x-sfp28
-    label: 15F
-  - name: TFGigabitEthernet 0/16
-    type: 25gbase-x-sfp28
-    label: 16F
-  - name: TFGigabitEthernet 0/17
-    type: 25gbase-x-sfp28
-    label: 17F
-  - name: TFGigabitEthernet 0/18
-    type: 25gbase-x-sfp28
-    label: 18F
-  - name: TFGigabitEthernet 0/19
-    type: 25gbase-x-sfp28
-    label: 19F
-  - name: TFGigabitEthernet 0/20
-    type: 25gbase-x-sfp28
-    label: 20F
-  - name: TFGigabitEthernet 0/21
-    type: 25gbase-x-sfp28
-    label: 21F
-  - name: TFGigabitEthernet 0/22
-    type: 25gbase-x-sfp28
-    label: 22F
-  - name: TFGigabitEthernet 0/23
-    type: 25gbase-x-sfp28
-    label: 23F
-  - name: TFGigabitEthernet 0/24
-    type: 25gbase-x-sfp28
-    label: 24F
-  - name: TFGigabitEthernet 0/25
-    type: 25gbase-x-sfp28
-    label: 25F
-  - name: TFGigabitEthernet 0/26
-    type: 25gbase-x-sfp28
-    label: 26F
-  - name: TFGigabitEthernet 0/27
-    type: 25gbase-x-sfp28
-    label: 27F
-  - name: TFGigabitEthernet 0/28
-    type: 25gbase-x-sfp28
-    label: 28F
-  - name: TFGigabitEthernet 0/29
-    type: 25gbase-x-sfp28
-    label: 29F
-  - name: TFGigabitEthernet 0/30
-    type: 25gbase-x-sfp28
-    label: 30F
-  - name: TFGigabitEthernet 0/31
-    type: 25gbase-x-sfp28
-    label: 31F
-  - name: TFGigabitEthernet 0/32
-    type: 25gbase-x-sfp28
-    label: 32F
-  - name: TFGigabitEthernet 0/33
-    type: 25gbase-x-sfp28
-    label: 33F
-  - name: TFGigabitEthernet 0/34
-    type: 25gbase-x-sfp28
-    label: 34F
-  - name: TFGigabitEthernet 0/35
-    type: 25gbase-x-sfp28
-    label: 35F
-  - name: TFGigabitEthernet 0/36
-    type: 25gbase-x-sfp28
-    label: 36F
-  - name: TFGigabitEthernet 0/37
-    type: 25gbase-x-sfp28
-    label: 37F
-  - name: TFGigabitEthernet 0/38
-    type: 25gbase-x-sfp28
-    label: 38F
-  - name: TFGigabitEthernet 0/39
-    type: 25gbase-x-sfp28
-    label: 39F
-  - name: TFGigabitEthernet 0/40
-    type: 25gbase-x-sfp28
-    label: 40F
-  - name: TFGigabitEthernet 0/41
-    type: 25gbase-x-sfp28
-    label: 41F
-  - name: TFGigabitEthernet 0/42
-    type: 25gbase-x-sfp28
-    label: 42F
-  - name: TFGigabitEthernet 0/43
-    type: 25gbase-x-sfp28
-    label: 43F
-  - name: TFGigabitEthernet 0/44
-    type: 25gbase-x-sfp28
-    label: 44F
-  - name: TFGigabitEthernet 0/45
-    type: 25gbase-x-sfp28
-    label: 45F
-  - name: TFGigabitEthernet 0/46
-    type: 25gbase-x-sfp28
-    label: 46F
-  - name: TFGigabitEthernet 0/47
-    type: 25gbase-x-sfp28
-    label: 47F
-  - name: TFGigabitEthernet 0/48
-    type: 25gbase-x-sfp28
-    label: 48F
   - name: HundredGigabitEthernet 0/49
     type: 100gbase-x-qsfp28
+    enabled: true
     label: 49F
   - name: HundredGigabitEthernet 0/50
     type: 100gbase-x-qsfp28
+    enabled: true
     label: 50F
   - name: HundredGigabitEthernet 0/51
     type: 100gbase-x-qsfp28
+    enabled: true
     label: 51F
   - name: HundredGigabitEthernet 0/52
     type: 100gbase-x-qsfp28
+    enabled: true
     label: 52F
   - name: HundredGigabitEthernet 0/53
     type: 100gbase-x-qsfp28
+    enabled: true
     label: 53F
   - name: HundredGigabitEthernet 0/54
     type: 100gbase-x-qsfp28
+    enabled: true
     label: 54F
   - name: HundredGigabitEthernet 0/55
     type: 100gbase-x-qsfp28
+    enabled: true
     label: 55F
   - name: HundredGigabitEthernet 0/56
     type: 100gbase-x-qsfp28
+    enabled: true
     label: 56F
+  - name: TFGigabitEthernet 0/1
+    type: 25gbase-x-sfp28
+    enabled: true
+    label: 1F
+  - name: TFGigabitEthernet 0/2
+    type: 25gbase-x-sfp28
+    enabled: true
+    label: 2F
+  - name: TFGigabitEthernet 0/3
+    type: 25gbase-x-sfp28
+    enabled: true
+    label: 3F
+  - name: TFGigabitEthernet 0/4
+    type: 25gbase-x-sfp28
+    enabled: true
+    label: 4F
+  - name: TFGigabitEthernet 0/5
+    type: 25gbase-x-sfp28
+    enabled: true
+    label: 5F
+  - name: TFGigabitEthernet 0/6
+    type: 25gbase-x-sfp28
+    enabled: true
+    label: 6F
+  - name: TFGigabitEthernet 0/7
+    type: 25gbase-x-sfp28
+    enabled: true
+    label: 7F
+  - name: TFGigabitEthernet 0/8
+    type: 25gbase-x-sfp28
+    enabled: true
+    label: 8F
+  - name: TFGigabitEthernet 0/9
+    type: 25gbase-x-sfp28
+    enabled: true
+    label: 9F
+  - name: TFGigabitEthernet 0/10
+    type: 25gbase-x-sfp28
+    enabled: true
+    label: 10F
+  - name: TFGigabitEthernet 0/11
+    type: 25gbase-x-sfp28
+    enabled: true
+    label: 11F
+  - name: TFGigabitEthernet 0/12
+    type: 25gbase-x-sfp28
+    enabled: true
+    label: 12F
+  - name: TFGigabitEthernet 0/13
+    type: 25gbase-x-sfp28
+    enabled: true
+    label: 13F
+  - name: TFGigabitEthernet 0/14
+    type: 25gbase-x-sfp28
+    enabled: true
+    label: 14F
+  - name: TFGigabitEthernet 0/15
+    type: 25gbase-x-sfp28
+    enabled: true
+    label: 15F
+  - name: TFGigabitEthernet 0/16
+    type: 25gbase-x-sfp28
+    enabled: true
+    label: 16F
+  - name: TFGigabitEthernet 0/17
+    type: 25gbase-x-sfp28
+    enabled: true
+    label: 17F
+  - name: TFGigabitEthernet 0/18
+    type: 25gbase-x-sfp28
+    enabled: true
+    label: 18F
+  - name: TFGigabitEthernet 0/19
+    type: 25gbase-x-sfp28
+    enabled: true
+    label: 19F
+  - name: TFGigabitEthernet 0/20
+    type: 25gbase-x-sfp28
+    enabled: true
+    label: 20F
+  - name: TFGigabitEthernet 0/21
+    type: 25gbase-x-sfp28
+    enabled: true
+    label: 21F
+  - name: TFGigabitEthernet 0/22
+    type: 25gbase-x-sfp28
+    enabled: true
+    label: 22F
+  - name: TFGigabitEthernet 0/23
+    type: 25gbase-x-sfp28
+    enabled: true
+    label: 23F
+  - name: TFGigabitEthernet 0/24
+    type: 25gbase-x-sfp28
+    enabled: true
+    label: 24F
+  - name: TFGigabitEthernet 0/25
+    type: 25gbase-x-sfp28
+    enabled: true
+    label: 25F
+  - name: TFGigabitEthernet 0/26
+    type: 25gbase-x-sfp28
+    enabled: true
+    label: 26F
+  - name: TFGigabitEthernet 0/27
+    type: 25gbase-x-sfp28
+    enabled: true
+    label: 27F
+  - name: TFGigabitEthernet 0/28
+    type: 25gbase-x-sfp28
+    enabled: true
+    label: 28F
+  - name: TFGigabitEthernet 0/29
+    type: 25gbase-x-sfp28
+    enabled: true
+    label: 29F
+  - name: TFGigabitEthernet 0/30
+    type: 25gbase-x-sfp28
+    enabled: true
+    label: 30F
+  - name: TFGigabitEthernet 0/31
+    type: 25gbase-x-sfp28
+    enabled: true
+    label: 31F
+  - name: TFGigabitEthernet 0/32
+    type: 25gbase-x-sfp28
+    enabled: true
+    label: 32F
+  - name: TFGigabitEthernet 0/33
+    type: 25gbase-x-sfp28
+    enabled: true
+    label: 33F
+  - name: TFGigabitEthernet 0/34
+    type: 25gbase-x-sfp28
+    enabled: true
+    label: 34F
+  - name: TFGigabitEthernet 0/35
+    type: 25gbase-x-sfp28
+    enabled: true
+    label: 35F
+  - name: TFGigabitEthernet 0/36
+    type: 25gbase-x-sfp28
+    enabled: true
+    label: 36F
+  - name: TFGigabitEthernet 0/37
+    type: 25gbase-x-sfp28
+    enabled: true
+    label: 37F
+  - name: TFGigabitEthernet 0/38
+    type: 25gbase-x-sfp28
+    enabled: true
+    label: 38F
+  - name: TFGigabitEthernet 0/39
+    type: 25gbase-x-sfp28
+    enabled: true
+    label: 39F
+  - name: TFGigabitEthernet 0/40
+    type: 25gbase-x-sfp28
+    enabled: true
+    label: 40F
+  - name: TFGigabitEthernet 0/41
+    type: 25gbase-x-sfp28
+    enabled: true
+    label: 41F
+  - name: TFGigabitEthernet 0/42
+    type: 25gbase-x-sfp28
+    enabled: true
+    label: 42F
+  - name: TFGigabitEthernet 0/43
+    type: 25gbase-x-sfp28
+    enabled: true
+    label: 43F
+  - name: TFGigabitEthernet 0/44
+    type: 25gbase-x-sfp28
+    enabled: true
+    label: 44F
+  - name: TFGigabitEthernet 0/45
+    type: 25gbase-x-sfp28
+    enabled: true
+    label: 45F
+  - name: TFGigabitEthernet 0/46
+    type: 25gbase-x-sfp28
+    enabled: true
+    label: 46F
+  - name: TFGigabitEthernet 0/47
+    type: 25gbase-x-sfp28
+    enabled: true
+    label: 47F
+  - name: TFGigabitEthernet 0/48
+    type: 25gbase-x-sfp28
+    enabled: true
+    label: 48F
   - name: mgmt 0
-    label: MGMT
     type: 1000base-t
+    enabled: true
     mgmt_only: true
+    label: MGMT
+module-bays:
+  - name: Power 1
+    label: PWR1
+    position: '1'
+  - name: Power 2
+    label: PWR2
+    position: '2'
diff --git a/device-types/Supermicro/SSE-X3348TR.yaml b/device-types/Supermicro/SSE-X3348TR.yaml
new file mode 100644
index 000000000..acd5a25d1
--- /dev/null
+++ b/device-types/Supermicro/SSE-X3348TR.yaml
@@ -0,0 +1,124 @@
+---
+manufacturer: Supermicro
+model: Supermicro SSE-X3348TR
+slug: supermicro-sse-x3348tr
+part_number: SSE-X3348TR
+u_height: 1
+is_full_depth: true
+comments: '[SSE-X3348T_Switch_Installation_Guide.pdf](https://www.supermicro.com/manuals/network/SSE-X3348T_Switch_Installation_Guide.pdf)'
+console-ports:
+  - name: Console
+    type: rj-45
+module-bays:
+  - name: PS1
+    position: '1'
+  - name: PS2
+    position: '2'
+interfaces:
+  - name: extreme-ethernet 0/1
+    type: 10gbase-t
+  - name: extreme-ethernet 0/2
+    type: 10gbase-t
+  - name: extreme-ethernet 0/3
+    type: 10gbase-t
+  - name: extreme-ethernet 0/4
+    type: 10gbase-t
+  - name: extreme-ethernet 0/5
+    type: 10gbase-t
+  - name: extreme-ethernet 0/6
+    type: 10gbase-t
+  - name: extreme-ethernet 0/7
+    type: 10gbase-t
+  - name: extreme-ethernet 0/8
+    type: 10gbase-t
+  - name: extreme-ethernet 0/9
+    type: 10gbase-t
+  - name: extreme-ethernet 0/10
+    type: 10gbase-t
+  - name: extreme-ethernet 0/11
+    type: 10gbase-t
+  - name: extreme-ethernet 0/12
+    type: 10gbase-t
+  - name: extreme-ethernet 0/13
+    type: 10gbase-t
+  - name: extreme-ethernet 0/14
+    type: 10gbase-t
+  - name: extreme-ethernet 0/15
+    type: 10gbase-t
+  - name: extreme-ethernet 0/16
+    type: 10gbase-t
+  - name: extreme-ethernet 0/17
+    type: 10gbase-t
+  - name: extreme-ethernet 0/18
+    type: 10gbase-t
+  - name: extreme-ethernet 0/19
+    type: 10gbase-t
+  - name: extreme-ethernet 0/20
+    type: 10gbase-t
+  - name: extreme-ethernet 0/21
+    type: 10gbase-t
+  - name: extreme-ethernet 0/22
+    type: 10gbase-t
+  - name: extreme-ethernet 0/23
+    type: 10gbase-t
+  - name: extreme-ethernet 0/24
+    type: 10gbase-t
+  - name: extreme-ethernet 0/25
+    type: 10gbase-t
+  - name: extreme-ethernet 0/26
+    type: 10gbase-t
+  - name: extreme-ethernet 0/27
+    type: 10gbase-t
+  - name: extreme-ethernet 0/28
+    type: 10gbase-t
+  - name: extreme-ethernet 0/29
+    type: 10gbase-t
+  - name: extreme-ethernet 0/30
+    type: 10gbase-t
+  - name: extreme-ethernet 0/31
+    type: 10gbase-t
+  - name: extreme-ethernet 0/32
+    type: 10gbase-t
+  - name: extreme-ethernet 0/33
+    type: 10gbase-t
+  - name: extreme-ethernet 0/34
+    type: 10gbase-t
+  - name: extreme-ethernet 0/35
+    type: 10gbase-t
+  - name: extreme-ethernet 0/36
+    type: 10gbase-t
+  - name: extreme-ethernet 0/37
+    type: 10gbase-t
+  - name: extreme-ethernet 0/38
+    type: 10gbase-t
+  - name: extreme-ethernet 0/39
+    type: 10gbase-t
+  - name: extreme-ethernet 0/40
+    type: 10gbase-t
+  - name: extreme-ethernet 0/41
+    type: 10gbase-t
+  - name: extreme-ethernet 0/42
+    type: 10gbase-t
+  - name: extreme-ethernet 0/43
+    type: 10gbase-t
+  - name: extreme-ethernet 0/44
+    type: 10gbase-t
+  - name: extreme-ethernet 0/45
+    type: 10gbase-t
+  - name: extreme-ethernet 0/46
+    type: 10gbase-t
+  - name: extreme-ethernet 0/47
+    type: 10gbase-t
+  - name: extreme-ethernet 0/48
+    type: 10gbase-t
+  - name: qx-ethernet 0/1
+    type: 40gbase-x-qsfpp
+  - name: qx-ethernet 0/2
+    type: 40gbase-x-qsfpp
+  - name: qx-ethernet 0/3
+    type: 40gbase-x-qsfpp
+  - name: qx-ethernet 0/4
+    type: 40gbase-x-qsfpp
+  - name: Management 1/1/1
+    type: 1000base-t
+    mgmt_only: true
diff --git a/device-types/TP-Link/TL-SG116E.yaml b/device-types/TP-Link/TL-SG116E.yaml
new file mode 100644
index 000000000..142eb7252
--- /dev/null
+++ b/device-types/TP-Link/TL-SG116E.yaml
@@ -0,0 +1,46 @@
+---
+manufacturer: TP-Link
+model: TL-SG116E
+slug: tp-link-tl-sg116e
+part_number: TL-SG116E
+comments: '[TP-Link TL-SG116E](https://www.tp-link.com/us/business-networking/easy-smart-switch/tl-sg116e/#specifications)'
+is_full_depth: false
+u_height: 0
+airflow: passive
+power-ports:
+  - name: PS1
+    type: dc-terminal
+    maximum_draw: 9
+interfaces:
+  - name: Port 1
+    type: 1000base-t
+  - name: Port 2
+    type: 1000base-t
+  - name: Port 3
+    type: 1000base-t
+  - name: Port 4
+    type: 1000base-t
+  - name: Port 5
+    type: 1000base-t
+  - name: Port 6
+    type: 1000base-t
+  - name: Port 7
+    type: 1000base-t
+  - name: Port 8
+    type: 1000base-t
+  - name: Port 9
+    type: 1000base-t
+  - name: Port 10
+    type: 1000base-t
+  - name: Port 11
+    type: 1000base-t
+  - name: Port 12
+    type: 1000base-t
+  - name: Port 13
+    type: 1000base-t
+  - name: Port 14
+    type: 1000base-t
+  - name: Port 15
+    type: 1000base-t
+  - name: Port 16
+    type: 1000base-t
diff --git a/device-types/TP-Link/TL-SG605E.yaml b/device-types/TP-Link/TL-SG605E.yaml
new file mode 100644
index 000000000..350f57cbd
--- /dev/null
+++ b/device-types/TP-Link/TL-SG605E.yaml
@@ -0,0 +1,24 @@
+---
+manufacturer: TP-Link
+model: TL-SG605E
+slug: tp-link-tl-sg605e
+part_number: TL-SG605E
+comments: '[TP-Link TL-SG605E](https://www.tp-link.com/uk/business-networking/easy-smart-switch/tl-sg605e/#specifications)'
+is_full_depth: false
+u_height: 0
+airflow: passive
+power-ports:
+  - name: PS1
+    type: dc-terminal
+    maximum_draw: 3
+interfaces:
+  - name: Port 1
+    type: 1000base-t
+  - name: Port 2
+    type: 1000base-t
+  - name: Port 3
+    type: 1000base-t
+  - name: Port 4
+    type: 1000base-t
+  - name: Port 5
+    type: 1000base-t
diff --git a/device-types/Ubiquiti/E7-Audience-US.yaml b/device-types/Ubiquiti/E7-Audience-US.yaml
new file mode 100644
index 000000000..35f014cbd
--- /dev/null
+++ b/device-types/Ubiquiti/E7-Audience-US.yaml
@@ -0,0 +1,43 @@
+---
+manufacturer: Ubiquiti
+model: E7 Audience US
+part_number: E7-Audience-US
+slug: ubiquiti-e7-audience-us
+u_height: 0
+is_full_depth: false
+airflow: passive
+comments: |
+  High-performance WiFi 7 access point with dual-band 5 GHz and 6 GHz connectivity, high selectivity PRISM RF filtering technology, and support for 1,500+ clients.
+  Dimensions: 18.7 x 10.5 x 1.7 in (Device), 5.9 x 4.5 x 4.9 in (Bracket)
+  Weight: 7.3 lb (Without mount), 9.5 lb (With mount)
+  Certifications: FCC, IC
+  [UniFi E7 Audience US Techspecs](https://techspecs.ui.com/unifi/wifi/e7-audience-us)
+weight: 7.3
+weight_unit: lb
+front_image: true
+interfaces:
+  - name: Port 1
+    type: 10gbase-t
+    poe_mode: pd
+    poe_type: type3-ieee802.3bt
+    mgmt_only: false
+  - name: Port 2
+    type: 1000base-t
+    poe_mode: pd
+    poe_type: type3-ieee802.3bt
+    mgmt_only: false
+  - name: WLAN 0
+    type: ieee802.11ac
+    label: 5 GHz
+    description: |
+      Max Data Rate: 8.6 Gbps (BW240), MIMO: 4x4 (DL/UL MU-MIMO), Max TX Power: 30 dBm, Antenna Gain: 15 dBi (Small Cell), 11 dBi (Large Cell)
+  - name: WLAN 1
+    type: ieee802.11be
+    label: 6 GHz (WiFi 7)
+    description: |
+      Max Data Rate: 11.5 Gbps (BW320), MIMO: 4x4 (DL/UL MU-MIMO), Max TX Power: 30 dBm (36 dBm EIRP with Extended Range), Antenna Gain: 15 dBi (Small Cell), 11 dBi (Large Cell)
+  - name: WLAN 2
+    type: other-wireless
+    label: Spectral Analyzer
+    description: |
+      Dedicated spectral analysis radio for interference mitigation and spectrum monitoring.
diff --git a/device-types/Ubiquiti/E7-Campus-US.yaml b/device-types/Ubiquiti/E7-Campus-US.yaml
new file mode 100644
index 000000000..4523afdd6
--- /dev/null
+++ b/device-types/Ubiquiti/E7-Campus-US.yaml
@@ -0,0 +1,49 @@
+---
+manufacturer: Ubiquiti
+model: E7 Campus
+part_number: E7-Campus-US
+slug: ubiquiti-e7-campus-us
+u_height: 0
+is_full_depth: false
+comments: |
+  High-performance outdoor WiFi 7 access point with dual PoE support for high availability, PRISM RF filtering technology, dedicated spectral analyzer, and tri-band connectivity for 2.4 GHz, 5 GHz, and 6 GHz.
+  Weatherproofing: IPX6 (IP67 with Waterproof Door Kit)
+  Wind Survivability: 37 lbf at 125 mph
+  Dimensions: 9.8 x 9.8 x 1.8 in (Device), 4.1 x 5.9 in (Articulating mount)
+  Weight: 4.9 lb (Device), 2 lb (Articulating mount)
+  Certifications: FCC, IC
+  [UniFi E7 Campus Techspecs](https://techspecs.ui.com/unifi/wifi/e7-campus-us)
+airflow: passive
+weight: 4.9
+weight_unit: lb
+front_image: true
+interfaces:
+  - name: Port 1
+    type: 10gbase-t
+    poe_mode: pd
+    poe_type: type3-ieee802.3bt
+    mgmt_only: false
+  - name: Port 2
+    type: 1000base-t
+    poe_mode: pd
+    poe_type: type3-ieee802.3bt
+    mgmt_only: false
+  - name: WLAN 0
+    type: ieee802.11n
+    label: 2.4 GHz
+    description: |
+      Max Data Rate: 688 Mbps (BW40), MIMO: 2x2 (DL/UL MU-MIMO), Max TX Power: 23 dBm, Antenna Gain: 9 dBi
+  - name: WLAN 1
+    type: ieee802.11ac
+    label: 5 GHz
+    description: |
+      Max Data Rate: 8.6 Gbps (BW240), MIMO: 4x4 (DL/UL MU-MIMO), Max TX Power: 30 dBm, Antenna Gain: 12 dBi
+  - name: WLAN 2
+    type: ieee802.11be
+    label: 6 GHz (WiFi 7)
+    description: |
+      Max Data Rate: 11.5 Gbps (BW320), MIMO: 4x4 (DL/UL MU-MIMO), Max TX Power: 30 dBm (36 dBm EIRP with Extended Range Mode), Antenna Gain: 12 dBi
+  - name: Spectrum Radio
+    type: other-wireless
+    description: |
+      Dedicated spectral analysis radio for interference mitigation and spectrum monitoring.
diff --git a/device-types/Ubiquiti/E7.yaml b/device-types/Ubiquiti/E7.yaml
new file mode 100644
index 000000000..f7a726d93
--- /dev/null
+++ b/device-types/Ubiquiti/E7.yaml
@@ -0,0 +1,47 @@
+---
+manufacturer: Ubiquiti
+model: E7
+part_number: E7
+slug: ubiquiti-e7
+u_height: 0
+is_full_depth: false
+comments: |
+  High-performance WiFi 7 access point with dual PoE support for high availability, dedicated spectral analyzer, and tri-band connectivity for 2.4 GHz, 5 GHz, and 6 GHz.
+  Dimensions: 9.8 x 9.8 x 1.7 in
+  Weight: 4 lb
+  Certifications: CE, FCC, IC
+  [UniFi E7 Techspecs](https://techspecs.ui.com/unifi/wifi/e7)
+airflow: passive
+weight: 4
+weight_unit: lb
+front_image: true
+interfaces:
+  - name: Port 1
+    type: 10gbase-t
+    poe_mode: pd
+    poe_type: type3-ieee802.3bt
+    mgmt_only: false
+  - name: Port 2
+    type: 1000base-t
+    poe_mode: pd
+    poe_type: type3-ieee802.3bt
+    mgmt_only: false
+  - name: WLAN 0
+    type: ieee802.11n
+    label: 2.4 GHz
+    description: |
+      Max Data Rate: 688 Mbps (BW40), MIMO: 2x2 (DL/UL MU-MIMO), Max TX Power: 23 dBm, Antenna Gain: 5 dBi
+  - name: WLAN 1
+    type: ieee802.11ac
+    label: 5 GHz
+    description: |
+      Max Data Rate: 8.6 Gbps (BW240), MIMO: 4x4 (DL/UL MU-MIMO), Max TX Power: 30 dBm, Antenna Gain: 6 dBi
+  - name: WLAN 2
+    type: ieee802.11be
+    label: 6 GHz (WiFi 7)
+    description: |
+      Max Data Rate: 11.5 Gbps (BW320), MIMO: 4x4 (DL/UL MU-MIMO), Max TX Power: 24 dBm (30 dBm with Extended Range Mode), Antenna Gain: 6 dBi
+  - name: Spectrum Radio
+    type: other-wireless
+    description: |
+      Dedicated spectral analysis radio for interference mitigation and spectrum monitoring.
diff --git a/device-types/Ubiquiti/ECS-Aggregation.yaml b/device-types/Ubiquiti/ECS-Aggregation.yaml
new file mode 100644
index 000000000..f8399d906
--- /dev/null
+++ b/device-types/Ubiquiti/ECS-Aggregation.yaml
@@ -0,0 +1,138 @@
+---
+manufacturer: Ubiquiti
+model: Enterprise Campus Aggregation
+slug: ubiquiti-enterprise-campus-aggregation
+part_number: ECS-Aggregation
+comments: |
+  [Enterprise Campus Aggregation](https://store.ui.com/products/ecs-aggregation)
+
+  High-performance campus aggregation switch with (48) 25/10G SFP28 ports and (6) 100/40G QSFP28 ports. Ideal for high-throughput campus environments with total non-blocking throughput of 1.8 Tbps.
+
+  Dimensions: 442.4 x 43.7 x 496 mm (17.4 x 1.7 x 19.5")
+  Weight: 9.9 kg (21.8 lb)
+  Max Power Consumption: 340W
+  Certifications: CE, FCC, IC
+
+u_height: 1
+is_full_depth: false
+airflow: front-to-rear
+front_image: true
+rear_image: true
+interfaces:
+  # SFP28 ports (25/10G, 1-48)
+  - name: SFP28 Port 1
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 2
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 3
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 4
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 5
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 6
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 7
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 8
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 9
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 10
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 11
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 12
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 13
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 14
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 15
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 16
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 17
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 18
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 19
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 20
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 21
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 22
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 23
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 24
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 25
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 26
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 27
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 28
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 29
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 30
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 31
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 32
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 33
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 34
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 35
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 36
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 37
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 38
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 39
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 40
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 41
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 42
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 43
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 44
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 45
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 46
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 47
+    type: 25gbase-x-sfp28
+  - name: SFP28 Port 48
+    type: 25gbase-x-sfp28
+  # QSFP28 ports (100/40G, 49-54)
+  - name: QSFP28 Port 49
+    type: 100gbase-x-qsfp28
+  - name: QSFP28 Port 50
+    type: 100gbase-x-qsfp28
+  - name: QSFP28 Port 51
+    type: 100gbase-x-qsfp28
+  - name: QSFP28 Port 52
+    type: 100gbase-x-qsfp28
+  - name: QSFP28 Port 53
+    type: 100gbase-x-qsfp28
+  - name: QSFP28 Port 54
+    type: 100gbase-x-qsfp28
+module-bays:
+  - name: PSU 1
+    position: left
+    installed_module: ubiquiti-uacc-psu-12v-550w
+  - name: PSU 2
+    position: right
+    installed_module: ubiquiti-uacc-psu-12v-550w
diff --git a/device-types/Ubiquiti/EFG.yaml b/device-types/Ubiquiti/EFG.yaml
new file mode 100644
index 000000000..1fcca4668
--- /dev/null
+++ b/device-types/Ubiquiti/EFG.yaml
@@ -0,0 +1,47 @@
+---
+manufacturer: Ubiquiti
+model: Enterprise Fortress Gateway
+slug: ubiquiti-enterprise-fortress-gateway
+part_number: EFG
+comments: |
+  [Enterprise Fortress Gateway](https://store.ui.com/products/enterprise-fortress-gateway)
+
+  High-performance enterprise gateway with (2) 2.5GbE RJ45 ports, (2) 10G SFP+ ports, and (2) 25G SFP28 ports. Supports redundant WAN failover and load balancing.
+
+  Dimensions: 442.4 x 43.7 x 325 mm (17.4 x 1.7 x 12.8")
+  Weight: 6.5 kg (14.3 lb)
+  Max Power Consumption: 82W
+  Certifications: CE, FCC, IC
+
+u_height: 1
+is_full_depth: false
+airflow: front-to-rear
+front_image: true
+rear_image: true
+interfaces:
+  # RJ45 2.5GbE Ports (1-2)
+  - name: Port 1
+    type: 2.5gbase-t
+    label: Default WAN 1
+  - name: Port 2
+    type: 2.5gbase-t
+
+  # SFP+ 10GbE Ports (3-4)
+  - name: Port 3
+    type: 10gbase-x-sfpp
+  - name: Port 4
+    type: 10gbase-x-sfpp
+
+  # SFP28 25GbE Ports (5-6)
+  - name: Port 5
+    type: 25gbase-x-sfp28
+    label: Default WAN 2
+  - name: Port 6
+    type: 25gbase-x-sfp28
+module-bays:
+  - name: PSU 1
+    position: left
+    installed_module: ubiquiti-uacc-psu-12v-150w
+  - name: PSU 2
+    position: right
+    installed_module: ubiquiti-uacc-psu-12v-150w
diff --git a/device-types/Ubiquiti/ENVR.yaml b/device-types/Ubiquiti/ENVR.yaml
new file mode 100644
index 000000000..c2c10305c
--- /dev/null
+++ b/device-types/Ubiquiti/ENVR.yaml
@@ -0,0 +1,32 @@
+---
+manufacturer: Ubiquiti
+model: Enterprise Network Video Recorder
+slug: ubiquiti-enterprise-network-video-recorder
+part_number: ENVR
+airflow: front-to-rear
+comments: |
+  Enterprise-grade 4U NVR with 16 bays for high-capacity video storage.
+
+  Dimensions: 481.4 x 480 x 132 mm (19 x 18.9 x 5.2")
+  Weight: 36.6 lb
+  Certifications: FCC, CE, IC
+
+  [Enterprise Network Video Recorder Techspecs](https://techspecs.ui.com/unifi/cameras-nvrs/envr)
+u_height: 4
+is_full_depth: false
+front_image: true
+rear_image: true
+weight: 36.6
+weight_unit: lb
+interfaces:
+  - name: LAN 1
+    type: 10gbase-t
+  - name: SFP+ 1
+    type: 10gbase-x-sfpp
+  - name: SFP+ 2
+    type: 10gbase-x-sfpp
+module-bays:
+  - name: PSU1
+    position: '1'
+  - name: PSU2
+    position: '2'
diff --git a/device-types/Ubiquiti/U7-Outdoor.yaml b/device-types/Ubiquiti/U7-Outdoor.yaml
new file mode 100644
index 000000000..44ba6987c
--- /dev/null
+++ b/device-types/Ubiquiti/U7-Outdoor.yaml
@@ -0,0 +1,34 @@
+---
+manufacturer: Ubiquiti
+model: U7 Outdoor
+part_number: U7-Outdoor
+slug: ubiquiti-u7-outdoor
+u_height: 0
+is_full_depth: false
+airflow: passive
+weight: 1.2
+weight_unit: kg
+comments: |
+  The U7 Outdoor has the following antenna configurations and stats:
+  - (1) Directional internal antenna:
+    - 2.4 GHz: 8 dBi gain, 90deg beamwidth
+    - 5 GHz: 12.5 dBi gain, 45deg beamwidth
+  - (2) External omni antennas:
+    - 2.4 GHz: 3 dBi gain
+    - 5 GHz: 4 dBi gain
+  - (2) RP-SMA connectors for external antennas
+  Additional features:
+  - Weatherproofing: IPX6
+  - Wind survivability: 74.6 N at 200 km/h (16.8 lbf at 125 mph)
+interfaces:
+  - name: Port 1
+    type: 2.5gbase-t
+    poe_mode: pd
+    poe_type: type2-ieee802.3at
+    mgmt_only: true
+  - name: Wlan 0
+    type: ieee802.11n
+  - name: Wlan 1
+    type: ieee802.11ac
+  - name: Wlan 2
+    type: ieee802.11ax
diff --git a/device-types/Ubiquiti/U7-Pro-Max.yaml b/device-types/Ubiquiti/U7-Pro-Max.yaml
new file mode 100644
index 000000000..ac1825358
--- /dev/null
+++ b/device-types/Ubiquiti/U7-Pro-Max.yaml
@@ -0,0 +1,50 @@
+---
+manufacturer: Ubiquiti
+model: U7 Pro Max
+part_number: U7-Pro-Max
+slug: ubiquiti-u7-pro-max
+u_height: 0
+is_full_depth: false
+comments: |
+  [Access Point U7 Pro Max](https://store.ui.com/us/en/category/wifi-flagship/products/u7-pro-max)
+
+  High-performance WiFi 7 access point with 2.5GbE support and tri-band connectivity for 2.4 GHz, 5 GHz, and 6 GHz. Capable of MU-MIMO with 500+ concurrent clients.
+
+  Dimensions: 206 x 46 mm (8.1 x 1.8")
+  Weight: 680 g (1.5 lb)
+  Certifications: CE, FCC, IC
+airflow: passive
+weight: 680
+weight_unit: g
+front_image: true
+interfaces:
+  - name: Port 1
+    type: 2.5gbase-t
+    poe_mode: pd
+    poe_type: type2-ieee802.3at
+    mgmt_only: false
+  - name: WLAN 0
+    type: ieee802.11n
+    label: 2.4 GHz
+    description: |
+      Max Data Rate: 688 Mbps (BW40), MIMO: 2x2 (DL/UL MU-MIMO), Max TX Power: 23 dBm, Antenna Gain: 4 dBi
+  - name: WLAN 1
+    type: ieee802.11ac
+    label: 5 GHz
+    description: |
+      Max Data Rate: 8.6 Gbps (BW240), MIMO: 4x4 (DL/UL MU-MIMO), Max TX Power: 29 dBm, Antenna Gain: 6 dBi
+  - name: WLAN 2
+    type: ieee802.11ax
+    label: 6 GHz (WiFi 6E)
+    description: |
+      Max Data Rate: 5.7 Gbps (BW320), MIMO: 2x2 (DL/UL MU-MIMO), Max TX Power: 23 dBm, Antenna Gain: 5.9 dBi
+  - name: WLAN 3
+    type: ieee802.11be
+    label: 5 GHz (WiFi 7)
+    description: |
+      Max Data Rate: 8.6 Gbps (BW240), MIMO: 4x4 (DL/UL MU-MIMO), Max TX Power: 29 dBm, Antenna Gain: 6 dBi
+  - name: WLAN 4
+    type: ieee802.11be
+    label: 6 GHz (WiFi 7)
+    description: |
+      Max Data Rate: 5.7 Gbps (BW320), MIMO: 2x2 (DL/UL MU-MIMO), Max TX Power: 23 dBm, Antenna Gain: 5.9 dBi
diff --git a/device-types/Ubiquiti/UACC-Rack-Panel-Patch-Blank-24.yaml b/device-types/Ubiquiti/UACC-Rack-Panel-Patch-Blank-24.yaml
new file mode 100644
index 000000000..3d039294b
--- /dev/null
+++ b/device-types/Ubiquiti/UACC-Rack-Panel-Patch-Blank-24.yaml
@@ -0,0 +1,74 @@
+---
+manufacturer: Ubiquiti
+model: 24-Port Blank Keystone Patch Panel
+slug: ubiquiti-uacc-rack-panel-patch-blank-24
+part_number: UACC-Rack-Panel-Patch-Blank-24
+u_height: 1
+is_full_depth: false
+subdevice_role: parent
+comments: |
+  [Ubiquiti 24-Port Keystone Patch Panel](https://store.ui.com)
+
+  Dimensions:
+  - Standalone insert: 442.4 x 63.5 x 43.7 mm (17.4 x 2.5 x 1.7")
+  - Management bar: 433.8 x 71.5 x 17 mm (17.1 x 2.8 x 0.7")
+
+  Weight:
+  - Standalone insert: 260 g (9.17 oz)
+  - Management bar: 390 g (13.8 oz)
+
+  Materials:
+  - Front panel housing: Cold rolled carbon steel (SPCC)
+  - Inner module: Polycarbonate
+  - Management bar: Cold rolled carbon steel (SPCC)
+module-bays:
+  - name: '1'
+    position: '1'
+  - name: '2'
+    position: '2'
+  - name: '3'
+    position: '3'
+  - name: '4'
+    position: '4'
+  - name: '5'
+    position: '5'
+  - name: '6'
+    position: '6'
+  - name: '7'
+    position: '7'
+  - name: '8'
+    position: '8'
+  - name: '9'
+    position: '9'
+  - name: '10'
+    position: '10'
+  - name: '11'
+    position: '11'
+  - name: '12'
+    position: '12'
+  - name: '13'
+    position: '13'
+  - name: '14'
+    position: '14'
+  - name: '15'
+    position: '15'
+  - name: '16'
+    position: '16'
+  - name: '17'
+    position: '17'
+  - name: '18'
+    position: '18'
+  - name: '19'
+    position: '19'
+  - name: '20'
+    position: '20'
+  - name: '21'
+    position: '21'
+  - name: '22'
+    position: '22'
+  - name: '23'
+    position: '23'
+  - name: '24'
+    position: '24'
+front_image: true
+rear_image: true
diff --git a/device-types/Ubiquiti/UNAS-Pro.yaml b/device-types/Ubiquiti/UNAS-Pro.yaml
new file mode 100644
index 000000000..72ac5c38a
--- /dev/null
+++ b/device-types/Ubiquiti/UNAS-Pro.yaml
@@ -0,0 +1,38 @@
+---
+manufacturer: Ubiquiti
+model: UNAS Pro
+slug: ubiquiti-unas-pro
+part_number: UNAS-Pro
+airflow: front-to-rear
+comments: |
+  Enterprise-grade 7-bay NAS for data storage.
+
+  Dimensions: 442 x 325 x 87 mm (17.4 x 12.8 x 3.4")
+  Weight: 20.3 lb (without mounting brackets)
+  Certifications: FCC, CE, IC
+  Processor: Quad-Core ARM Cortex-A57 at 1.7 GHz
+  Memory: 8 GB
+  Display: 1.3" touchscreen LCM
+
+  [UNAS Pro Techspecs](https://techspecs.ui.com/unifi/integrations/unas-pro)
+u_height: 2
+is_full_depth: false
+front_image: true
+rear_image: true
+weight: 20.3
+weight_unit: lb
+interfaces:
+  - name: LAN 1
+    type: 1000base-t
+  - name: SFP+ 1
+    type: 10gbase-x-sfpp
+  - name: Bluetooth Interface
+    type: other
+    label: Bluetooth 4.1
+power-ports:
+  - name: AC Input
+    type: iec-60320-c14
+    maximum_draw: 200
+  - name: USP-RPS DC Input
+    type: ubiquiti-smartpower
+    maximum_draw: 160
diff --git a/device-types/Ubiquiti/UNVR-Pro.yaml b/device-types/Ubiquiti/UNVR-Pro.yaml
index 504040fa4..ea0909f4b 100644
--- a/device-types/Ubiquiti/UNVR-Pro.yaml
+++ b/device-types/Ubiquiti/UNVR-Pro.yaml
@@ -3,22 +3,27 @@ manufacturer: Ubiquiti
 model: UniFi Protect Network Video Recorder Pro
 slug: ubiquiti-unifi-protect-network-video-recorder-pro
 part_number: UNVR-Pro
+airflow: front-to-rear
 comments: |
-  Network Video Recorder with seven bays,
+  Network Video Recorder with seven bays.
 
   Dimensions: 442 x 325 x 87 mm (17.4 x 12.8 x 3.4")
+  [UniFi Protect Network Video Recorder Pro Techspecs](https://techspecs.ui.com/unifi/cameras-nvrs/unvr-pro)
 u_height: 2
-is_full_depth: true
+is_full_depth: false
+front_image: true
+rear_image: true
+weight: 20.8
+weight_unit: lb
 interfaces:
   - name: LAN 1
     type: 1000base-t
   - name: SFP+ 2 (LAN)
     type: 10gbase-x-sfpp
 power-ports:
-  - name: Supply
+  - name: Input
     type: iec-60320-c14
-    maximum_draw: 100
+    maximum_draw: 160
   - name: USP-RPS connector for PSU failover
     type: ubiquiti-smartpower
-    # USP-RPS DC input, 11.5VDC, 10.43A
     maximum_draw: 160
diff --git a/device-types/Ubiquiti/UNVR.yaml b/device-types/Ubiquiti/UNVR.yaml
index 9688d4fb9..253ed0033 100644
--- a/device-types/Ubiquiti/UNVR.yaml
+++ b/device-types/Ubiquiti/UNVR.yaml
@@ -3,23 +3,27 @@ manufacturer: Ubiquiti
 model: UniFi Protect Network Video Recorder
 slug: ubiquiti-unifi-protect-network-video-recorder
 part_number: UNVR
+airflow: front-to-rear
 comments: |
-  Network Video Recorder with four bays,
+  Network Video Recorder with four bays.
 
   Dimensions: 442.4 x 325 x 43.7 mm (17.4 x 12.8 x 1.7")
+  [UniFi Protect Network Video Recorder Techspecs](https://techspecs.ui.com/unifi/cameras-nvrs/unvr)
 u_height: 1
-is_full_depth: true
+is_full_depth: false
+front_image: true
+rear_image: true
+weight: 11.5
+weight_unit: lb
 interfaces:
   - name: LAN 1
     type: 1000base-t
   - name: SFP+ 2 (LAN)
     type: 10gbase-x-sfpp
 power-ports:
-  - name: Supply
+  - name: Input
     type: iec-60320-c14
     maximum_draw: 100
   - name: USP-RPS connector for PSU failover
-    # TODO: There is no proper DC "terminalblock" connection type defined
-    type: iec-60320-c20
-    # USP-RPS DC input, 11.5VDC, 10.43A
+    type: ubiquiti-smartpower
     maximum_draw: 100
diff --git a/device-types/Ubiquiti/USP-PDU-HD.yaml b/device-types/Ubiquiti/USP-PDU-HD.yaml
new file mode 100644
index 000000000..31525f698
--- /dev/null
+++ b/device-types/Ubiquiti/USP-PDU-HD.yaml
@@ -0,0 +1,92 @@
+---
+manufacturer: Ubiquiti
+model: USP PDU HD
+part_number: USP-PDU-HD
+slug: ubiquiti-usp-pdu-hd
+u_height: 0  # 0U, mounted at the back of the rack
+is_full_depth: false
+comments: |
+  High-density rack-mounted PDU with 24 managed outlets (125V AC, 15A Max.), 4 USB-C ports, and redundant network interfaces.
+  Dimensions: 1485 x 55 x 56 mm (58.5 x 2.17 x 2.2").
+airflow: passive
+weight: 6.3
+weight_unit: kg
+front_image: true
+rear_image: true
+interfaces:
+  - name: Management Port
+    type: 100base-tx
+    label: Management (RJ45)
+  - name: Network Port 1
+    type: 1000base-t
+    label: Network Redundancy Port 1
+  - name: Network Port 2
+    type: 1000base-t
+    label: Network Redundancy Port 2
+  - name: Network Port 3
+    type: 1000base-t
+    label: Network Redundancy Port 3
+power-ports:
+  - name: Power Input
+    type: nema-l5-30p
+    maximum_draw: 3750  # Total max draw in watts
+power-outlets:
+  # Bank 1: Outlets 1-12
+  - name: Outlet 1
+    type: nema-5-15r
+  - name: Outlet 2
+    type: nema-5-15r
+  - name: Outlet 3
+    type: nema-5-15r
+  - name: Outlet 4
+    type: nema-5-15r
+  - name: Outlet 5
+    type: nema-5-15r
+  - name: Outlet 6
+    type: nema-5-15r
+  - name: Outlet 7
+    type: nema-5-15r
+  - name: Outlet 8
+    type: nema-5-15r
+  - name: Outlet 9
+    type: nema-5-15r
+  - name: Outlet 10
+    type: nema-5-15r
+  - name: Outlet 11
+    type: nema-5-15r
+  - name: Outlet 12
+    type: nema-5-15r
+  # USB-C Ports (13-16)
+  - name: USB-C 13
+    type: usb-c
+  - name: USB-C 14
+    type: usb-c
+  - name: USB-C 15
+    type: usb-c
+  - name: USB-C 16
+    type: usb-c
+  # Bank 2: Outlets 17-28
+  - name: Outlet 17
+    type: nema-5-15r
+  - name: Outlet 18
+    type: nema-5-15r
+  - name: Outlet 19
+    type: nema-5-15r
+  - name: Outlet 20
+    type: nema-5-15r
+  - name: Outlet 21
+    type: nema-5-15r
+  - name: Outlet 22
+    type: nema-5-15r
+  - name: Outlet 23
+    type: nema-5-15r
+  - name: Outlet 24
+    type: nema-5-15r
+  - name: Outlet 25
+    type: nema-5-15r
+  - name: Outlet 26
+    type: nema-5-15r
+  - name: Outlet 27
+    type: nema-5-15r
+  - name: Outlet 28
+    type: nema-5-15r
diff --git a/device-types/Ubiquiti/USP-PDU-Pro.yaml b/device-types/Ubiquiti/USP-PDU-Pro.yaml
new file mode 100644
index 000000000..8bf2c4f77
--- /dev/null
+++ b/device-types/Ubiquiti/USP-PDU-Pro.yaml
@@ -0,0 +1,103 @@
+---
+manufacturer: Ubiquiti
+model: Power Distribution Pro
+slug: ubiquiti-usp-pdu-pro
+part_number: USP-PDU-Pro
+u_height: 2
+is_full_depth: false
+comments: |
+  [Power Distribution Pro](https://store.ui.com/products/usp-pdu-pro)
+
+  2U rack-mounted power distribution unit with (16) controllable power outlets, (4) USB-C ports, and (4) Ethernet ports for monitoring and control.
+
+  Dimensions: 442.4 x 87.4 x 106 mm (17.4 x 3.4 x 4.2")
+airflow: passive
+weight: 3.7
+weight_unit: kg
+interfaces:
+  - name: Port 21
+    type: 100base-tx
+    label: Main Internet
+    mgmt_only: true
+  - name: Port 22
+    type: 1000base-t
+    label: Reserved for future use
+    mgmt_only: true
+  - name: Port 23
+    type: 1000base-t
+    label: Reserved for future use
+    mgmt_only: true
+  - name: Port 24
+    type: 1000base-t
+    label: Reserved for future use
+    mgmt_only: true
+power-ports:
+  - name: Input
+    type: nema-5-15p
+    maximum_draw: 1875
+    description: 125V AC, 15A Max., 50/60 Hz
+power-outlets:
+  # USB-C Ports
+  - name: Outlet 1
+    type: usb-c
+    power_port: Input
+  - name: Outlet 2
+    type: usb-c
+    power_port: Input
+  - name: Outlet 3
+    type: usb-c
+    power_port: Input
+  - name: Outlet 4
+    type: usb-c
+    power_port: Input
+  # Power Control Outlets (Top Row: Ports 5-16)
+  - name: Outlet 5
+    type: nema-5-15r
+    power_port: Input
+  - name: Outlet 6
+    type: nema-5-15r
+    power_port: Input
+  - name: Outlet 7
+    type: nema-5-15r
+    power_port: Input
+  - name: Outlet 8
+    type: nema-5-15r
+    power_port: Input
+  - name: Outlet 9
+    type: nema-5-15r
+    power_port: Input
+  - name: Outlet 10
+    type: nema-5-15r
+    power_port: Input
+  - name: Outlet 11
+    type: nema-5-15r
+    power_port: Input
+  - name: Outlet 12
+    type: nema-5-15r
+    power_port: Input
+  - name: Outlet 13
+    type: nema-5-15r
+    power_port: Input
+  - name: Outlet 14
+    type: nema-5-15r
+    power_port: Input
+  - name: Outlet 15
+    type: nema-5-15r
+    power_port: Input
+  - name: Outlet 16
+    type: nema-5-15r
+    power_port: Input
+  # Power Control Outlets (Bottom Row: Ports 17-20)
+  - name: Outlet 17
+    type: nema-5-15r
+    power_port: Input
+  - name: Outlet 18
+    type: nema-5-15r
+    power_port: Input
+  - name: Outlet 19
+    type: nema-5-15r
+    power_port: Input
+  - name: Outlet 20
+    type: nema-5-15r
+    power_port: Input
+front_image: true
diff --git a/device-types/Ubiquiti/USP-RPS.yaml b/device-types/Ubiquiti/USP-RPS.yaml
index ff74e0fff..b64b5b514 100644
--- a/device-types/Ubiquiti/USP-RPS.yaml
+++ b/device-types/Ubiquiti/USP-RPS.yaml
@@ -5,13 +5,17 @@ slug: ubiquiti-unifi-smartpower-rps
 airflow: front-to-rear
 part_number: USP-RPS
 comments: |
-  [UniFi Power Backup](https://store.ui.com/products/usp-rps)
+  [UniFi Power Backup Techspecs](https://techspecs.ui.com/unifi/power-tech/usp-rps)
 
   950W backup power unit that provides full redundancy for rack-mounted UniFi devices.
 
   Dimensions: 442.4 x 43.7 x 325.6 mm (17.42 x 1.72 x 12.82")
 u_height: 1
+weight: 12.3
+weight_unit: lb
 is_full_depth: false
+front_image: true
+rear_image: true
 interfaces:
   - name: Port 1
     type: 1000base-t
diff --git a/device-types/Ubiquiti/USW-Aggregation.yaml b/device-types/Ubiquiti/USW-Aggregation.yaml
index 9aa0ad934..6da18f320 100644
--- a/device-types/Ubiquiti/USW-Aggregation.yaml
+++ b/device-types/Ubiquiti/USW-Aggregation.yaml
@@ -7,6 +7,8 @@ comments: |
   UniFi Switch Aggregation, 10G 8-Port Managed Aggregation Switch, 30W, (8) SFP+
 
   Dimensions: 442.4 x 120 x 43.7 mm (17.42 x 4.72 x 1.72")
+
+  [USW-Aggregation Techspecs]https://techspecs.ui.com/unifi/switching/usw-pro-aggregation
 u_height: 1
 weight: 2.7
 weight_unit: kg
diff --git a/device-types/Ubiquiti/USW-Enterprise-24-PoE.yaml b/device-types/Ubiquiti/USW-Enterprise-24-PoE.yaml
index eb344b539..936bc4b4d 100644
--- a/device-types/Ubiquiti/USW-Enterprise-24-PoE.yaml
+++ b/device-types/Ubiquiti/USW-Enterprise-24-PoE.yaml
@@ -3,16 +3,19 @@ manufacturer: Ubiquiti
 model: UniFi Switch Enterprise 24 PoE
 slug: ubiquiti-unifi-switch-enterprise-24-poe
 part_number: USW-Enterprise-24-PoE
-comments: 'UniFi Switch Enterprise 24 PoE (150W + max. 400W PoE), (12) 2.5 Gigabit PoE+ IEEE 802.3af/at, (12) 1 Gigabit PoE+ IEEE 802.3af/at, (2) SFP+\nDimensions:
-  442.4 x 43.7 x 325 mm (17.4 x 1.7 x 12.8")\n[Switch Enterprise 24 PoE Datasheet](https://dl.ui.com/ds/usw-enterprise-24-poe_ds)'
+comments: |
+  UniFi Switch Enterprise 24 PoE (150W + max. 400W PoE), (12) 2.5 Gigabit PoE+ IEEE 802.3af/at, (12) 1 Gigabit PoE+ IEEE 802.3af/at, (2) SFP+
+
+  Dimensions: 442.4 x 43.7 x 325 mm (17.4 x 1.7 x 12.8")
+
+  [Switch Enterprise 24 PoE Techspecs](https://techspecs.ui.com/unifi/switching/usw-enterprise-24-poe)
 u_height: 1
 is_full_depth: false
-weight: 11.46
+front_image: true
+rear_image: true
+weight: 11.5
 weight_unit: lb
-power-ports:
-  - name: PSU1
-    type: iec-60320-c14
-    maximum_draw: 550
+airflow: front-to-rear
 interfaces:
   - name: Port 1
     type: 1000base-t
@@ -114,3 +117,10 @@ interfaces:
     type: 10gbase-x-sfpp
   - name: SFP+ 26
     type: 10gbase-x-sfpp
+power-ports:
+  - name: Input
+    type: iec-60320-c14
+    maximum_draw: 460
+  - name: USP-RPS connector for PSU failover
+    type: ubiquiti-smartpower
+    maximum_draw: 460
diff --git a/device-types/Ubiquiti/USW-Enterprise-48-PoE.yaml b/device-types/Ubiquiti/USW-Enterprise-48-PoE.yaml
index 06594faa6..51e348504 100644
--- a/device-types/Ubiquiti/USW-Enterprise-48-PoE.yaml
+++ b/device-types/Ubiquiti/USW-Enterprise-48-PoE.yaml
@@ -6,9 +6,15 @@ part_number: USW-Enterprise-48-PoE
 comments: |
   UniFi Switch Enterprise 48 PoE (150W + max. 720W PoE), (48) 2.5 Gigabit PoE+ IEEE 802.3af/at, (4) SFP+
 
-  Dimensions: 442 x 44 x 400 mm (17.4 x 1.7 x 15.7")
+  Dimensions: 442.4 x 43.7 x 325 mm (17.4 x 1.7 x 12.8")
+  [Switch Enterprise 48 PoE Techspecs](https://techspecs.ui.com/unifi/switching/usw-enterprise-48-poe)
 u_height: 1
-is_full_depth: true
+is_full_depth: false
+front_image: true
+rear_image: true
+weight: 13.9
+weight_unit: lb
+airflow: front-to-rear
 interfaces:
   - name: Port 1
     type: 2.5gbase-t
@@ -214,3 +220,6 @@ power-ports:
   - name: Input
     type: iec-60320-c14
     maximum_draw: 870
+  - name: USP-RPS connector for PSU failover
+    type: ubiquiti-smartpower
+    maximum_draw: 600
diff --git a/device-types/Ubiquiti/USW-Pro-24-PoE.yaml b/device-types/Ubiquiti/USW-Pro-24-PoE.yaml
index 252bb3050..eceb8c4ad 100644
--- a/device-types/Ubiquiti/USW-Pro-24-PoE.yaml
+++ b/device-types/Ubiquiti/USW-Pro-24-PoE.yaml
@@ -2,15 +2,19 @@
 manufacturer: Ubiquiti
 model: UniFi Switch 24 Pro PoE Gen2
 slug: ubiquiti-unifi-switch-24-pro-poe-gen2
-part_number: USW-PRO-24-POE
+part_number: USW-Pro-24-POE
 comments: |
   UniFi Switch 24 Pro PoE (50W + max. 400W PoE), Gen2, (24) Gigabit, (1-16) Gigabit PoE+ IEEE 802.3af/at, (17-24) Gigabit 60W PoE++ IEEE 802.3bt, (2) SFP+
 
   Dimensions: 442.4 x 285.4 x 43.7 mm (17.42 x 11.24 x 1.72")
+  [Switch Switch 24 Pro PoE Techspecs](https://techspecs.ui.com/unifi/switching/usw-pro-24-poe)
 u_height: 1
 is_full_depth: false
 front_image: true
 rear_image: true
+weight: 9.7
+weight_unit: lb
+airflow: front-to-rear
 interfaces:
   - name: Port 1
     type: 1000base-t
@@ -116,3 +120,6 @@ power-ports:
   - name: Input
     type: iec-60320-c14
     maximum_draw: 450
+  - name: USP-RPS connector for PSU failover
+    type: ubiquiti-smartpower
+    maximum_draw: 450
diff --git a/device-types/Ubiquiti/USW-Pro-24.yaml b/device-types/Ubiquiti/USW-Pro-24.yaml
index 566a5048f..4b8bfc8b8 100644
--- a/device-types/Ubiquiti/USW-Pro-24.yaml
+++ b/device-types/Ubiquiti/USW-Pro-24.yaml
@@ -1,16 +1,21 @@
 ---
 manufacturer: Ubiquiti
-model: USW-PRO-24
-slug: ubiquiti-usw-pro-24
+model: UniFi Switch 24 Pro
+slug: ubiquiti-unifi-switch-24-pro
+part_number: USW-Pro-24
 comments: |
-  [UniFi Switch Pro 24](https://store.ui.com/collections/unifi-network-switching/products/usw-pro-24)
+  UniFi Switch 24 Pro (50W), (24) Gigabit, (1-16) Gigabit, (17-24) Gigabit, (2) SFP+
 
-  24-port switch with (24) Gigabit RJ45 ports and (2) 10G SFP+ ports. Powerful second-generation UniFi switching
+  Dimensions: 442.4 x 285 x 44 mm (17.4 x 11.2 x 1.7")
 
-  Dimensions: 442.4 x 285.4 x 43.7 mm (17.42 x 11.24 x 1.72")
+  [Switch Switch 24 Pro Techspecs](https://techspecs.ui.com/unifi/switching/usw-pro-24)
 u_height: 1
+is_full_depth: false
 front_image: true
-is_full_depth: true
+rear_image: true
+weight: 7.9
+weight_unit: lb
+airflow: front-to-rear
 interfaces:
   - name: Port 1
     type: 1000base-t
@@ -67,4 +72,7 @@ interfaces:
 power-ports:
   - name: Input
     type: iec-60320-c14
-    maximum_draw: 450
+    maximum_draw: 30
+  - name: USP-RPS connector for PSU failover
+    type: ubiquiti-smartpower
+    maximum_draw: 30
diff --git a/device-types/Ubiquiti/USW-Pro-48-PoE.yaml b/device-types/Ubiquiti/USW-Pro-48-PoE.yaml
index 9ea3d0fc8..774f5babc 100644
--- a/device-types/Ubiquiti/USW-Pro-48-PoE.yaml
+++ b/device-types/Ubiquiti/USW-Pro-48-PoE.yaml
@@ -7,8 +7,14 @@ comments: |
   UniFi Switch 48 Pro PoE (60W + max. 600W PoE), Gen2, (48) Gigabit, (1-40) Gigabit PoE+ IEEE 802.3af/at, (41-48) 60W PoE++ IEEE 802.3bt, (4) SFP+
 
   Dimensions: 442.4 x 399.6 x 43.7 mm (17.42 x 15.73 x 1.72")
+  [Switch Switch 48 Pro PoE Techspecs](https://techspecs.ui.com/unifi/switching/usw-pro-48-poe)
 u_height: 1
-is_full_depth: true
+is_full_depth: false
+front_image: true
+rear_image: true
+weight: 14
+weight_unit: lb
+airflow: front-to-rear
 interfaces:
   - name: Port 1
     type: 1000base-t
@@ -214,3 +220,6 @@ power-ports:
   - name: Input
     type: iec-60320-c14
     maximum_draw: 660
+  - name: USP-RPS connector for PSU failover
+    type: ubiquiti-smartpower
+    maximum_draw: 600
diff --git a/device-types/Ubiquiti/USW-Pro-48.yaml b/device-types/Ubiquiti/USW-Pro-48.yaml
index 9f5070cca..388d9c251 100644
--- a/device-types/Ubiquiti/USW-Pro-48.yaml
+++ b/device-types/Ubiquiti/USW-Pro-48.yaml
@@ -4,11 +4,17 @@ model: UniFi Switch 48 Pro
 slug: ubiquiti-unifi-switch-48-pro
 part_number: USW-Pro-48
 comments: |
-  UniFi Switch 48 Pro, Gen2, (48) Gigabit, (4) SFP+
+  UniFi Switch 48 Pro (60W), (48) Gigabit, (4) SFP+
 
-  Dimensions: 442.4 x 285.4 x 43.7 mm (17.42 x 15.73 x 1.72")
+  Dimensions: 442.4 x 285 x 44 mm (17.4 x 11.2 x 1.7")
+  [Switch Switch 48 Pro Techspecs](https://techspecs.ui.com/unifi/switching/usw-pro-48)
 u_height: 1
-is_full_depth: true
+is_full_depth: false
+front_image: true
+rear_image: true
+weight: 9
+weight_unit: lb
+airflow: front-to-rear
 interfaces:
   - name: Port 1
     type: 1000base-t
@@ -118,3 +124,6 @@ power-ports:
   - name: Input
     type: iec-60320-c14
     maximum_draw: 60
+  - name: USP-RPS connector for PSU failover
+    type: ubiquiti-smartpower
+    maximum_draw: 60
diff --git a/device-types/Ubiquiti/USW-Pro-Aggregation.yaml b/device-types/Ubiquiti/USW-Pro-Aggregation.yaml
index f43fb544b..d5d45aebc 100644
--- a/device-types/Ubiquiti/USW-Pro-Aggregation.yaml
+++ b/device-types/Ubiquiti/USW-Pro-Aggregation.yaml
@@ -4,11 +4,17 @@ model: UniFi Switch Pro Aggregation
 slug: ubiquiti-unifi-switch-pro-aggregation
 part_number: USW-Pro-Aggregation
 comments: |
-  UniFi Switch Pro Aggregation, 10G 28-Port and 25G 4-Port Managed Aggregation Switch, 100W, (28) SFP+ (4) SFP28
+  UniFi Switch Pro Aggregation, 10G 28-Port and 25G 4-Port Managed Aggregation Switch, 100W, (28) SFP+ (4) SFP28.
 
   Dimensions: 442 x 325 x 44 mm (17.4 x 12.8 x 1.7")
+  [UniFi Switch Pro Aggregation Techspecs](https://techspecs.ui.com/unifi/switching/usw-pro-aggregation)
 u_height: 1
 is_full_depth: false
+front_image: true
+rear_image: true
+weight: 10.4
+weight_unit: lb
+airflow: front-to-rear
 interfaces:
   - name: SFP+ 1
     type: 10gbase-x-sfpp
@@ -80,3 +86,4 @@ power-ports:
     maximum_draw: 100
   - name: USP-RPS DC input
     type: ubiquiti-smartpower
+    maximum_draw: 50
diff --git a/device-types/Ubiquiti/USW-Pro-Max-24-PoE.yaml b/device-types/Ubiquiti/USW-Pro-Max-24-PoE.yaml
index 74b4d77c3..9aee686a9 100644
--- a/device-types/Ubiquiti/USW-Pro-Max-24-PoE.yaml
+++ b/device-types/Ubiquiti/USW-Pro-Max-24-PoE.yaml
@@ -7,11 +7,14 @@ comments: |
   UniFi Switch 24 Pro Max PoE (50W + max. 400W PoE), (16) Gigabit + (8) 2.5GbE, (1-8) Gigabit PoE+ IEEE 802.3af/at, (9-16) Gigabit PoE++ IEEE 802.3bt, (17-24) 2.5GbE 60W PoE++ IEEE 802.3bt, (2) SFP+
 
   Dimensions: 442 x 325 x 44 mm (17.4 x 12.8 x 1.7")
+  [UniFi Switch Pro Max 24 PoE Techspecs](https://techspecs.ui.com/unifi/switching/usw-pro-max-24-poe)
 u_height: 1
-weight: 5.20
-weight_unit: kg
+weight: 11.5
+weight_unit: lb
 airflow: front-to-rear
 is_full_depth: false
+front_image: true
+rear_image: true
 interfaces:
   - name: Port 1
     type: 1000base-t
@@ -117,3 +120,6 @@ power-ports:
   - name: Input
     type: iec-60320-c14
     maximum_draw: 450
+  - name: USP-RPS connector for PSU failover
+    type: ubiquiti-smartpower
+    maximum_draw: 450
diff --git a/device-types/Ubiquiti/USW-Pro-Max-24.yaml b/device-types/Ubiquiti/USW-Pro-Max-24.yaml
new file mode 100644
index 000000000..ec6f3d93f
--- /dev/null
+++ b/device-types/Ubiquiti/USW-Pro-Max-24.yaml
@@ -0,0 +1,80 @@
+---
+manufacturer: Ubiquiti
+model: UniFi Switch Pro Max 24
+slug: ubiquiti-unifi-switch-pro-max-24
+part_number: USW-Pro-Max-24
+comments: |
+  UniFi Switch 24 Pro Max (non-PoE) with total non-blocking throughput of 56 Gbps. Features (16) Gigabit Ethernet ports, (8) 1/2.5GbE ports, and (2) 10G SFP+ uplink ports.
+
+  Dimensions: 442 x 325 x 44 mm (17.4 x 12.8 x 1.7")
+  [UniFi Switch Pro Max 24 Techspecs](https://techspecs.ui.com/unifi/switching/usw-pro-max-24)
+u_height: 1
+weight: 9.5
+weight_unit: lb
+airflow: front-to-rear
+is_full_depth: false
+front_image: true
+rear_image: true
+interfaces:
+  # Gigabit Ethernet ports (1-16)
+  - name: Port 1
+    type: 1000base-t
+  - name: Port 2
+    type: 1000base-t
+  - name: Port 3
+    type: 1000base-t
+  - name: Port 4
+    type: 1000base-t
+  - name: Port 5
+    type: 1000base-t
+  - name: Port 6
+    type: 1000base-t
+  - name: Port 7
+    type: 1000base-t
+  - name: Port 8
+    type: 1000base-t
+  - name: Port 9
+    type: 1000base-t
+  - name: Port 10
+    type: 1000base-t
+  - name: Port 11
+    type: 1000base-t
+  - name: Port 12
+    type: 1000base-t
+  - name: Port 13
+    type: 1000base-t
+  - name: Port 14
+    type: 1000base-t
+  - name: Port 15
+    type: 1000base-t
+  - name: Port 16
+    type: 1000base-t
+  # 2.5GbE Ethernet ports (17-24)
+  - name: Port 17
+    type: 2.5gbase-t
+  - name: Port 18
+    type: 2.5gbase-t
+  - name: Port 19
+    type: 2.5gbase-t
+  - name: Port 20
+    type: 2.5gbase-t
+  - name: Port 21
+    type: 2.5gbase-t
+  - name: Port 22
+    type: 2.5gbase-t
+  - name: Port 23
+    type: 2.5gbase-t
+  - name: Port 24
+    type: 2.5gbase-t
+  # SFP+ uplink ports (25-26)
+  - name: SFP+ 25
+    type: 10gbase-x-sfpp
+  - name: SFP+ 26
+    type: 10gbase-x-sfpp
+power-ports:
+  - name: AC Input
+    type: iec-60320-c14
+    maximum_draw: 50
+  - name: USP-RPS connector for PSU failover
+    type: ubiquiti-smartpower
+    maximum_draw: 50
diff --git a/device-types/Ubiquiti/USW-Pro-Max-48-PoE.yaml b/device-types/Ubiquiti/USW-Pro-Max-48-PoE.yaml
new file mode 100644
index 000000000..1fc7ed830
--- /dev/null
+++ b/device-types/Ubiquiti/USW-Pro-Max-48-PoE.yaml
@@ -0,0 +1,229 @@
+---
+manufacturer: Ubiquiti
+model: UniFi Switch Pro Max 48 PoE
+slug: ubiquiti-unifi-switch-pro-max-48-poe
+part_number: USW-Pro-Max-48-PoE
+comments: |
+  UniFi Switch 48 Pro Max PoE with total available PoE of 720W. Features (32) Gigabit PoE/PoE+ ports (including 8 PoE++), (16) 2.5GbE PoE++ ports, and (4) 10G SFP+ uplink ports.
+
+  Dimensions: 442.4 x 400 x 44 mm (17.4 x 15.7 x 1.7")
+  [UniFi Switch Pro Max 48 PoE Techspecs](https://techspecs.ui.com/unifi/switching/usw-pro-max-48-poe)
+u_height: 1
+weight: 13.9
+weight_unit: lb
+airflow: front-to-rear
+is_full_depth: false
+front_image: true
+rear_image: true
+interfaces:
+  # Gigabit PoE/PoE+ ports (1-24)
+  - name: Port 1
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 2
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 3
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 4
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 5
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 6
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 7
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 8
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 9
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 10
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 11
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 12
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 13
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 14
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 15
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 16
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 17
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 18
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 19
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 20
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 21
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 22
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 23
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Port 24
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  # Gigabit PoE++ ports (25-32)
+  - name: Port 25
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Port 26
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Port 27
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Port 28
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Port 29
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Port 30
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Port 31
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Port 32
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  # 2.5GbE PoE++ ports (33-48)
+  - name: Port 33
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Port 34
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Port 35
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Port 36
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Port 37
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Port 38
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Port 39
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Port 40
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Port 41
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Port 42
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Port 43
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Port 44
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Port 45
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Port 46
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Port 47
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  - name: Port 48
+    type: 2.5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+  # SFP+ uplink ports (49-52)
+  - name: SFP+ 49
+    type: 10gbase-x-sfpp
+  - name: SFP+ 50
+    type: 10gbase-x-sfpp
+  - name: SFP+ 51
+    type: 10gbase-x-sfpp
+  - name: SFP+ 52
+    type: 10gbase-x-sfpp
+power-ports:
+  - name: AC Input
+    type: iec-60320-c14
+    maximum_draw: 820
+  - name: USP-RPS connector for PSU failover
+    type: ubiquiti-smartpower
+    maximum_draw: 600
diff --git a/device-types/Ubiquiti/USW-Pro-Max-48.yaml b/device-types/Ubiquiti/USW-Pro-Max-48.yaml
new file mode 100644
index 000000000..dd3eec48e
--- /dev/null
+++ b/device-types/Ubiquiti/USW-Pro-Max-48.yaml
@@ -0,0 +1,132 @@
+---
+manufacturer: Ubiquiti
+model: UniFi Switch Pro Max 48
+slug: ubiquiti-unifi-switch-pro-max-48
+part_number: USW-Pro-Max-48
+comments: |
+  UniFi Switch 48 Pro Max (non-PoE) with total non-blocking throughput of 112 Gbps. Features (32) Gigabit Ethernet ports, (16) 1/2.5GbE ports, and (4) 10G SFP+ uplink ports.
+
+  Dimensions: 442 x 325 x 44 mm (17.4 x 12.8 x 1.7")
+  [UniFi Switch Pro Max 48 Techspecs](https://techspecs.ui.com/unifi/switching/usw-pro-max-48)
+u_height: 1
+weight: 10.8
+weight_unit: lb
+airflow: front-to-rear
+is_full_depth: false
+front_image: true
+rear_image: true
+interfaces:
+  # Gigabit Ethernet ports (1-32)
+  - name: Port 1
+    type: 1000base-t
+  - name: Port 2
+    type: 1000base-t
+  - name: Port 3
+    type: 1000base-t
+  - name: Port 4
+    type: 1000base-t
+  - name: Port 5
+    type: 1000base-t
+  - name: Port 6
+    type: 1000base-t
+  - name: Port 7
+    type: 1000base-t
+  - name: Port 8
+    type: 1000base-t
+  - name: Port 9
+    type: 1000base-t
+  - name: Port 10
+    type: 1000base-t
+  - name: Port 11
+    type: 1000base-t
+  - name: Port 12
+    type: 1000base-t
+  - name: Port 13
+    type: 1000base-t
+  - name: Port 14
+    type: 1000base-t
+  - name: Port 15
+    type: 1000base-t
+  - name: Port 16
+    type: 1000base-t
+  - name: Port 17
+    type: 1000base-t
+  - name: Port 18
+    type: 1000base-t
+  - name: Port 19
+    type: 1000base-t
+  - name: Port 20
+    type: 1000base-t
+  - name: Port 21
+    type: 1000base-t
+  - name: Port 22
+    type: 1000base-t
+  - name: Port 23
+    type: 1000base-t
+  - name: Port 24
+    type: 1000base-t
+  - name: Port 25
+    type: 1000base-t
+  - name: Port 26
+    type: 1000base-t
+  - name: Port 27
+    type: 1000base-t
+  - name: Port 28
+    type: 1000base-t
+  - name: Port 29
+    type: 1000base-t
+  - name: Port 30
+    type: 1000base-t
+  - name: Port 31
+    type: 1000base-t
+  - name: Port 32
+    type: 1000base-t
+  # 2.5GbE Ethernet ports (33-48)
+  - name: Port 33
+    type: 2.5gbase-t
+  - name: Port 34
+    type: 2.5gbase-t
+  - name: Port 35
+    type: 2.5gbase-t
+  - name: Port 36
+    type: 2.5gbase-t
+  - name: Port 37
+    type: 2.5gbase-t
+  - name: Port 38
+    type: 2.5gbase-t
+  - name: Port 39
+    type: 2.5gbase-t
+  - name: Port 40
+    type: 2.5gbase-t
+  - name: Port 41
+    type: 2.5gbase-t
+  - name: Port 42
+    type: 2.5gbase-t
+  - name: Port 43
+    type: 2.5gbase-t
+  - name: Port 44
+    type: 2.5gbase-t
+  - name: Port 45
+    type: 2.5gbase-t
+  - name: Port 46
+    type: 2.5gbase-t
+  - name: Port 47
+    type: 2.5gbase-t
+  - name: Port 48
+    type: 2.5gbase-t
+  # SFP+ uplink ports (49-52)
+  - name: SFP+ 49
+    type: 10gbase-x-sfpp
+  - name: SFP+ 50
+    type: 10gbase-x-sfpp
+  - name: SFP+ 51
+    type: 10gbase-x-sfpp
+  - name: SFP+ 52
+    type: 10gbase-x-sfpp
+power-ports:
+  - name: AC Input
+    type: iec-60320-c14
+    maximum_draw: 100
+  - name: USP-RPS connector for PSU failover
+    type: ubiquiti-smartpower
+    maximum_draw: 100
diff --git a/device-types/Ubiquiti/UniFi-Dream-Machine-Pro-Max.yaml b/device-types/Ubiquiti/UniFi-Dream-Machine-Pro-Max.yaml
index a5e4dbfd8..effee47ed 100644
--- a/device-types/Ubiquiti/UniFi-Dream-Machine-Pro-Max.yaml
+++ b/device-types/Ubiquiti/UniFi-Dream-Machine-Pro-Max.yaml
@@ -5,15 +5,18 @@ slug: ubiquiti-unifi-dream-machine-pro-max
 airflow: front-to-rear
 part_number: UDM-PRO-MAX
 comments: |
-  [UniFi Dream Machine Pro](https://store.ui.com/products/udm-pro)
+  UniFi Dream Machine Pro Max
 
   Enterprise Security Gateway and Network Appliance with 10G SFP+, (8) 1G LAN, (1) 2.5G WAN, (1) 1/10G SFP+ LAN, (1) 1/10G SFP+ WAN
 
   Dimensions: 442.4 x 43.7 x 285.6 mm (17.42 x 1.72 x 11.24")
+  [UniFi Dream Machine Pro Max Techspecs](https://techspecs.ui.com/unifi/unifi-cloud-gateways/udm-pro-max)
 u_height: 1
 is_full_depth: false
 front_image: true
 rear_image: true
+weight: 10.4
+weight_unit: lb
 interfaces:
   - name: port.1
     type: 1000base-t
@@ -48,7 +51,9 @@ interfaces:
   - name: port.11
     type: 10gbase-x-sfpp
 power-ports:
-  - name: ps1
+  - name: Input
     type: iec-60320-c14
-    maximum_draw: 33
-    description: 100-240VAC/50-60 Hz
+    maximum_draw: 100
+  - name: USP-RPS connector for PSU failover
+    type: ubiquiti-smartpower
+    maximum_draw: 100
diff --git a/device-types/Ubiquiti/UniFi-Dream-Machine-Pro-Special-Edition.yaml b/device-types/Ubiquiti/UniFi-Dream-Machine-Pro-Special-Edition.yaml
index 0d8bd1ced..39a755b4a 100644
--- a/device-types/Ubiquiti/UniFi-Dream-Machine-Pro-Special-Edition.yaml
+++ b/device-types/Ubiquiti/UniFi-Dream-Machine-Pro-Special-Edition.yaml
@@ -2,16 +2,21 @@
 manufacturer: Ubiquiti
 model: UniFi Dream Machine Pro Special Edition
 slug: ubiquiti-unifi-dream-machine-pro-special-edition
-airflow: front-to-rear
 part_number: UDM-SE
+airflow: front-to-rear
 comments: |
-  [UniFi Dream Machine Pro Special Edition](https://store.ui.com/collections/unifi-network-unifi-os-consoles/products/dream-machine-se)
+  UniFi Dream Machine Pro Special Edition
 
   Enterprise Security Gateway and Network Appliance with 10G SFP+, (8) 1G PoE LAN, (1) 2.5G WAN, (1) 1/10G SFP+ LAN, (1) 1/10G SFP+ WAN
 
   Dimensions: 442.4 x 43.7 x 285.6 mm (17.42 x 1.72 x 11.24")
+  [UniFi Dream Machine Pro Special Edition Techspecs](https://techspecs.ui.com/unifi/unifi-cloud-gateways/udm-se)
 u_height: 1
 is_full_depth: false
+front_image: true
+rear_image: true
+weight: 10.9
+weight_unit: lb
 interfaces:
   - name: port.1
     type: 1000base-t
@@ -63,7 +68,9 @@ interfaces:
     type: 10gbase-x-sfpp
     label: Port 11 - SFP+ LAN
 power-ports:
-  - name: ps1
+  - name: Input
     type: iec-60320-c14
-    maximum_draw: 33
-    description: 100-240VAC/50-60 Hz
+    maximum_draw: 230
+  - name: USP-RPS connector for PSU failover
+    type: ubiquiti-smartpower
+    maximum_draw: 230
diff --git a/device-types/Ubiquiti/UniFi-Dream-Machine-Pro.yaml b/device-types/Ubiquiti/UniFi-Dream-Machine-Pro.yaml
index d5a16a6b7..0ff78e24a 100644
--- a/device-types/Ubiquiti/UniFi-Dream-Machine-Pro.yaml
+++ b/device-types/Ubiquiti/UniFi-Dream-Machine-Pro.yaml
@@ -3,17 +3,19 @@ manufacturer: Ubiquiti
 model: UniFi Dream Machine Pro
 slug: ubiquiti-unifi-dream-machine-pro
 airflow: front-to-rear
-part_number: UDM-Pro
 comments: |
-  [UniFi Dream Machine Pro](https://store.ui.com/products/udm-pro)
+  UniFi Dream Machine Pro
 
   Enterprise Security Gateway and Network Appliance with 10G SFP+, (8) 1G LAN, (1) 1G WAN, (1) 1/10G SFP+ LAN, (1) 1/10G SFP+ WAN
 
   Dimensions: 442.4 x 43.7 x 285.6 mm (17.42 x 1.72 x 11.24")
+  [UniFi Dream Machine Pro Techspecs](https://techspecs.ui.com/unifi/unifi-cloud-gateways/udm-pro)
 u_height: 1
 is_full_depth: false
 front_image: true
 rear_image: true
+weight: 8.6
+weight_unit: lb
 interfaces:
   - name: port.1
     type: 1000base-t
@@ -48,7 +50,9 @@ interfaces:
   - name: port.11
     type: 10gbase-x-sfpp
 power-ports:
-  - name: ps1
+  - name: Input
     type: iec-60320-c14
     maximum_draw: 33
-    description: 100-240VAC/50-60 Hz
+  - name: USP-RPS connector for PSU failover
+    type: ubiquiti-smartpower
+    maximum_draw: 33
diff --git a/elevation-images/Cisco/cisco-n9k-c93180lc-ex.front.png b/elevation-images/Cisco/cisco-n9k-c93180lc-ex.front.png
new file mode 100644
index 000000000..7dc8e3a69
Binary files /dev/null and b/elevation-images/Cisco/cisco-n9k-c93180lc-ex.front.png differ
diff --git a/elevation-images/Cisco/cisco-n9k-c93180lc-ex.rear.png b/elevation-images/Cisco/cisco-n9k-c93180lc-ex.rear.png
new file mode 100644
index 000000000..3dbd7c82d
Binary files /dev/null and b/elevation-images/Cisco/cisco-n9k-c93180lc-ex.rear.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-e7-audience-us.front.png b/elevation-images/Ubiquiti/ubiquiti-e7-audience-us.front.png
new file mode 100644
index 000000000..5b5e021b1
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-e7-audience-us.front.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-e7-campus-us.front.png b/elevation-images/Ubiquiti/ubiquiti-e7-campus-us.front.png
new file mode 100644
index 000000000..d9892d624
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-e7-campus-us.front.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-e7.front.png b/elevation-images/Ubiquiti/ubiquiti-e7.front.png
new file mode 100644
index 000000000..8c0b97c03
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-e7.front.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-enterprise-campus-aggregation.front.png b/elevation-images/Ubiquiti/ubiquiti-enterprise-campus-aggregation.front.png
new file mode 100644
index 000000000..8046453e1
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-enterprise-campus-aggregation.front.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-enterprise-campus-aggregation.rear.png b/elevation-images/Ubiquiti/ubiquiti-enterprise-campus-aggregation.rear.png
new file mode 100644
index 000000000..3037045db
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-enterprise-campus-aggregation.rear.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-enterprise-fortress-gateway.front.png b/elevation-images/Ubiquiti/ubiquiti-enterprise-fortress-gateway.front.png
new file mode 100644
index 000000000..2143236ef
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-enterprise-fortress-gateway.front.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-enterprise-fortress-gateway.rear.png b/elevation-images/Ubiquiti/ubiquiti-enterprise-fortress-gateway.rear.png
new file mode 100644
index 000000000..c9e21e9ab
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-enterprise-fortress-gateway.rear.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-enterprise-network-video-recorder.front.png b/elevation-images/Ubiquiti/ubiquiti-enterprise-network-video-recorder.front.png
new file mode 100644
index 000000000..6734aad48
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-enterprise-network-video-recorder.front.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-enterprise-network-video-recorder.rear.png b/elevation-images/Ubiquiti/ubiquiti-enterprise-network-video-recorder.rear.png
new file mode 100644
index 000000000..8aa5391f5
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-enterprise-network-video-recorder.rear.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-u7-outdoor.front-min.png b/elevation-images/Ubiquiti/ubiquiti-u7-outdoor.front-min.png
new file mode 100644
index 000000000..672bfc41e
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-u7-outdoor.front-min.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-u7-outdoor.front.png b/elevation-images/Ubiquiti/ubiquiti-u7-outdoor.front.png
new file mode 100644
index 000000000..672bfc41e
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-u7-outdoor.front.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-u7-pro-max.front-min.png b/elevation-images/Ubiquiti/ubiquiti-u7-pro-max.front-min.png
new file mode 100644
index 000000000..dd969d429
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-u7-pro-max.front-min.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-u7-pro-max.front.png b/elevation-images/Ubiquiti/ubiquiti-u7-pro-max.front.png
new file mode 100644
index 000000000..dd969d429
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-u7-pro-max.front.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-uacc-rack-panel-patch-blank-24.front.png b/elevation-images/Ubiquiti/ubiquiti-uacc-rack-panel-patch-blank-24.front.png
new file mode 100644
index 000000000..38eb5322b
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-uacc-rack-panel-patch-blank-24.front.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-uacc-rack-panel-patch-blank-24.rear.png b/elevation-images/Ubiquiti/ubiquiti-uacc-rack-panel-patch-blank-24.rear.png
new file mode 100644
index 000000000..99257fe4e
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-uacc-rack-panel-patch-blank-24.rear.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-unas-pro.front.png b/elevation-images/Ubiquiti/ubiquiti-unas-pro.front.png
new file mode 100644
index 000000000..4731492e9
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-unas-pro.front.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-unas-pro.rear.png b/elevation-images/Ubiquiti/ubiquiti-unas-pro.rear.png
new file mode 100644
index 000000000..d13965c90
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-unas-pro.rear.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-unifi-dream-machine-pro-special-edition.front.png b/elevation-images/Ubiquiti/ubiquiti-unifi-dream-machine-pro-special-edition.front.png
new file mode 100644
index 000000000..45586ad11
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-unifi-dream-machine-pro-special-edition.front.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-unifi-dream-machine-pro-special-edition.rear.png b/elevation-images/Ubiquiti/ubiquiti-unifi-dream-machine-pro-special-edition.rear.png
new file mode 100644
index 000000000..ba77d6ca8
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-unifi-dream-machine-pro-special-edition.rear.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-unifi-protect-network-video-recorder-pro.front.png b/elevation-images/Ubiquiti/ubiquiti-unifi-protect-network-video-recorder-pro.front.png
new file mode 100644
index 000000000..365d59ad8
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-unifi-protect-network-video-recorder-pro.front.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-unifi-protect-network-video-recorder-pro.rear.png b/elevation-images/Ubiquiti/ubiquiti-unifi-protect-network-video-recorder-pro.rear.png
new file mode 100644
index 000000000..56d0a54d2
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-unifi-protect-network-video-recorder-pro.rear.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-unifi-protect-network-video-recorder.front.png b/elevation-images/Ubiquiti/ubiquiti-unifi-protect-network-video-recorder.front.png
new file mode 100644
index 000000000..fe3a06759
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-unifi-protect-network-video-recorder.front.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-unifi-protect-network-video-recorder.rear.png b/elevation-images/Ubiquiti/ubiquiti-unifi-protect-network-video-recorder.rear.png
new file mode 100644
index 000000000..63feac31b
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-unifi-protect-network-video-recorder.rear.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-unifi-smartpower-rps.front.png b/elevation-images/Ubiquiti/ubiquiti-unifi-smartpower-rps.front.png
new file mode 100644
index 000000000..c5463abfe
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-unifi-smartpower-rps.front.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-unifi-smartpower-rps.rear.png b/elevation-images/Ubiquiti/ubiquiti-unifi-smartpower-rps.rear.png
new file mode 100644
index 000000000..5952cf342
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-unifi-smartpower-rps.rear.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-usw-pro-24.front.png b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-24-pro.front.png
similarity index 100%
rename from elevation-images/Ubiquiti/ubiquiti-usw-pro-24.front.png
rename to elevation-images/Ubiquiti/ubiquiti-unifi-switch-24-pro.front.png
diff --git a/elevation-images/Ubiquiti/ubiquiti-unifi-switch-24-pro.rear.png b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-24-pro.rear.png
new file mode 100644
index 000000000..b45578c32
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-24-pro.rear.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-unifi-switch-48-pro-poe-gen2.front.png b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-48-pro-poe-gen2.front.png
new file mode 100644
index 000000000..e2b108db6
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-48-pro-poe-gen2.front.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-unifi-switch-48-pro-poe-gen2.rear.png b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-48-pro-poe-gen2.rear.png
new file mode 100644
index 000000000..02472b961
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-48-pro-poe-gen2.rear.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-unifi-switch-48-pro.front.png b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-48-pro.front.png
new file mode 100644
index 000000000..b6697baa1
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-48-pro.front.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-unifi-switch-48-pro.rear.png b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-48-pro.rear.png
new file mode 100644
index 000000000..7471ae7d6
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-48-pro.rear.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-unifi-switch-enterprise-24-poe.front.png b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-enterprise-24-poe.front.png
new file mode 100644
index 000000000..639ff6bb7
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-enterprise-24-poe.front.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-unifi-switch-enterprise-24-poe.rear.png b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-enterprise-24-poe.rear.png
new file mode 100644
index 000000000..33c3e2626
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-enterprise-24-poe.rear.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-unifi-switch-enterprise-48-poe.front.png b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-enterprise-48-poe.front.png
new file mode 100644
index 000000000..4e91a0568
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-enterprise-48-poe.front.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-unifi-switch-enterprise-48-poe.rear.png b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-enterprise-48-poe.rear.png
new file mode 100644
index 000000000..ccac9d26b
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-enterprise-48-poe.rear.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-unifi-switch-pro-aggregation.front.png b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-pro-aggregation.front.png
new file mode 100644
index 000000000..472257279
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-pro-aggregation.front.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-unifi-switch-pro-aggregation.rear.png b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-pro-aggregation.rear.png
new file mode 100644
index 000000000..dc18e8570
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-pro-aggregation.rear.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-unifi-switch-pro-max-24-poe.front.png b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-pro-max-24-poe.front.png
new file mode 100644
index 000000000..8a15e7b8c
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-pro-max-24-poe.front.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-unifi-switch-pro-max-24-poe.rear.png b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-pro-max-24-poe.rear.png
new file mode 100644
index 000000000..95f551b43
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-pro-max-24-poe.rear.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-unifi-switch-pro-max-24.front.png b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-pro-max-24.front.png
new file mode 100644
index 000000000..b8beff005
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-pro-max-24.front.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-unifi-switch-pro-max-24.rear.png b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-pro-max-24.rear.png
new file mode 100644
index 000000000..1253e2b53
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-pro-max-24.rear.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-unifi-switch-pro-max-48-poe.front.png b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-pro-max-48-poe.front.png
new file mode 100644
index 000000000..760597d3d
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-pro-max-48-poe.front.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-unifi-switch-pro-max-48-poe.rear.png b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-pro-max-48-poe.rear.png
new file mode 100644
index 000000000..ea9cf720b
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-pro-max-48-poe.rear.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-unifi-switch-pro-max-48.front.png b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-pro-max-48.front.png
new file mode 100644
index 000000000..25728eee7
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-pro-max-48.front.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-unifi-switch-pro-max-48.rear.png b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-pro-max-48.rear.png
new file mode 100644
index 000000000..051d2c2b7
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-unifi-switch-pro-max-48.rear.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-unvr-pro.front.png b/elevation-images/Ubiquiti/ubiquiti-unvr-pro.front.png
deleted file mode 100644
index c02653993..000000000
Binary files a/elevation-images/Ubiquiti/ubiquiti-unvr-pro.front.png and /dev/null differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-usp-pdu-hd.front.png b/elevation-images/Ubiquiti/ubiquiti-usp-pdu-hd.front.png
new file mode 100644
index 000000000..162891d8d
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-usp-pdu-hd.front.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-usp-pdu-hd.rear.png b/elevation-images/Ubiquiti/ubiquiti-usp-pdu-hd.rear.png
new file mode 100644
index 000000000..18415d2fe
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-usp-pdu-hd.rear.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-usp-pdu-pro.front.png b/elevation-images/Ubiquiti/ubiquiti-usp-pdu-pro.front.png
new file mode 100644
index 000000000..e94cf50e2
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-usp-pdu-pro.front.png differ
diff --git a/elevation-images/Ubiquiti/ubiquiti-usp-pdu-pro.rear.png b/elevation-images/Ubiquiti/ubiquiti-usp-pdu-pro.rear.png
new file mode 100644
index 000000000..1a74bf828
Binary files /dev/null and b/elevation-images/Ubiquiti/ubiquiti-usp-pdu-pro.rear.png differ
diff --git a/module-types/Extreme Networks/5720-VIM-2CE.yaml b/module-types/Extreme Networks/5720-VIM-2CE.yaml
new file mode 100644
index 000000000..a373330ac
--- /dev/null
+++ b/module-types/Extreme Networks/5720-VIM-2CE.yaml	
@@ -0,0 +1,10 @@
+---
+manufacturer: Extreme Networks
+model: 5720-VIM-2CE
+part_number: 5720-VIM-2CE
+comments: 2x 100Gbase-X QSFP28 ports (unpopulated)
+interfaces:
+  - name: VIM1
+    type: 100gbase-x-qsfp28
+  - name: VIM2
+    type: 100gbase-x-qsfp28
diff --git a/module-types/Extreme Networks/5720-VIM-6YE.yaml b/module-types/Extreme Networks/5720-VIM-6YE.yaml
new file mode 100644
index 000000000..922e23a9f
--- /dev/null
+++ b/module-types/Extreme Networks/5720-VIM-6YE.yaml	
@@ -0,0 +1,18 @@
+---
+manufacturer: Extreme Networks
+model: 5720-VIM-6YE
+part_number: 5720-VIM-6YE
+comments: 6x 1/10/25Gbase-X SFP28 ports (unpopulated)
+interfaces:
+  - name: VIM1
+    type: 25gbase-x-sfp28
+  - name: VIM2
+    type: 25gbase-x-sfp28
+  - name: VIM3
+    type: 25gbase-x-sfp28
+  - name: VIM4
+    type: 25gbase-x-sfp28
+  - name: VIM5
+    type: 25gbase-x-sfp28
+  - name: VIM6
+    type: 25gbase-x-sfp28
diff --git a/module-types/Extreme Networks/XN-ACPWR-1200W-FB.yaml b/module-types/Extreme Networks/XN-ACPWR-1200W-FB.yaml
new file mode 100644
index 000000000..ca8ab43c3
--- /dev/null
+++ b/module-types/Extreme Networks/XN-ACPWR-1200W-FB.yaml	
@@ -0,0 +1,7 @@
+---
+manufacturer: Extreme Networks
+model: XN-ACPWR-1200W-FB
+power-ports:
+  - name: Ps#{module}
+    type: iec-60320-c14
+    maximum_draw: 1200
diff --git a/module-types/Extreme Networks/XN-ACPWR-1200W.yaml b/module-types/Extreme Networks/XN-ACPWR-1200W.yaml
new file mode 100644
index 000000000..c7e2beacf
--- /dev/null
+++ b/module-types/Extreme Networks/XN-ACPWR-1200W.yaml	
@@ -0,0 +1,7 @@
+---
+manufacturer: Extreme Networks
+model: XN-ACPWR-1200W
+power-ports:
+  - name: Ps#{module}
+    type: iec-60320-c16
+    maximum_draw: 1200
diff --git a/module-types/Extreme Networks/XN-ACPWR-150W-FB.yaml b/module-types/Extreme Networks/XN-ACPWR-150W-FB.yaml
new file mode 100644
index 000000000..7182dadee
--- /dev/null
+++ b/module-types/Extreme Networks/XN-ACPWR-150W-FB.yaml	
@@ -0,0 +1,7 @@
+---
+manufacturer: Extreme Networks
+model: XN-ACPWR-150W-FB
+power-ports:
+  - name: Ps#{module}
+    type: iec-60320-c14
+    maximum_draw: 150
diff --git a/module-types/Extreme Networks/XN-ACPWR-150W.yaml b/module-types/Extreme Networks/XN-ACPWR-150W.yaml
new file mode 100644
index 000000000..511db4ecd
--- /dev/null
+++ b/module-types/Extreme Networks/XN-ACPWR-150W.yaml	
@@ -0,0 +1,7 @@
+---
+manufacturer: Extreme Networks
+model: XN-ACPWR-150W
+power-ports:
+  - name: Ps#{module}
+    type: iec-60320-c14
+    maximum_draw: 150
diff --git a/module-types/Extreme Networks/XN-ACPWR-2000W-FB-A.yaml b/module-types/Extreme Networks/XN-ACPWR-2000W-FB-A.yaml
new file mode 100644
index 000000000..717c41a10
--- /dev/null
+++ b/module-types/Extreme Networks/XN-ACPWR-2000W-FB-A.yaml	
@@ -0,0 +1,7 @@
+---
+manufacturer: Extreme Networks
+model: XN-ACPWR-2000W-FB-A
+power-ports:
+  - name: Ps#{module}
+    type: iec-60320-c14
+    maximum_draw: 2000
diff --git a/module-types/Extreme Networks/XN-ACPWR-2000W.yaml b/module-types/Extreme Networks/XN-ACPWR-2000W.yaml
new file mode 100644
index 000000000..169f05c39
--- /dev/null
+++ b/module-types/Extreme Networks/XN-ACPWR-2000W.yaml	
@@ -0,0 +1,7 @@
+---
+manufacturer: Extreme Networks
+model: XN-ACPWR-2000W
+power-ports:
+  - name: Ps#{module}
+    type: iec-60320-c16
+    maximum_draw: 2000
diff --git a/module-types/Extreme Networks/XN-ACPWR-600W-FB.yaml b/module-types/Extreme Networks/XN-ACPWR-600W-FB.yaml
new file mode 100644
index 000000000..7289a0595
--- /dev/null
+++ b/module-types/Extreme Networks/XN-ACPWR-600W-FB.yaml	
@@ -0,0 +1,7 @@
+---
+manufacturer: Extreme Networks
+model: XN-ACPWR-600W-FB
+power-ports:
+  - name: Ps#{module}
+    type: iec-60320-c14
+    maximum_draw: 600
diff --git a/module-types/Extreme Networks/XN-ACPWR-600W.yaml b/module-types/Extreme Networks/XN-ACPWR-600W.yaml
new file mode 100644
index 000000000..cf084a252
--- /dev/null
+++ b/module-types/Extreme Networks/XN-ACPWR-600W.yaml	
@@ -0,0 +1,7 @@
+---
+manufacturer: Extreme Networks
+model: XN-ACPWR-600W
+power-ports:
+  - name: Ps#{module}
+    type: iec-60320-c14
+    maximum_draw: 600
diff --git a/module-types/Extreme Networks/XN-ACPWR-920W.yaml b/module-types/Extreme Networks/XN-ACPWR-920W.yaml
new file mode 100644
index 000000000..b31b855eb
--- /dev/null
+++ b/module-types/Extreme Networks/XN-ACPWR-920W.yaml	
@@ -0,0 +1,7 @@
+---
+manufacturer: Extreme Networks
+model: XN-ACPWR-920W
+power-ports:
+  - name: Ps#{module}
+    type: iec-60320-c14
+    maximum_draw: 920
diff --git a/module-types/Meinberg/IMS-GXL.yml b/module-types/Meinberg/IMS-GXL.yml
index f21eba8ba..fff56eb57 100644
--- a/module-types/Meinberg/IMS-GXL.yml
+++ b/module-types/Meinberg/IMS-GXL.yml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Meinberg
 description: 448-channel multi-band, multi-GNSS receiver for reception of signals from the GPS (L1 C/A, L2 C/A, L2 P(Y)), Galileo (E1-B/C, E5a, and E5b),
-  BeiDou (B1I, B2I, and B3I) and GLONASS (L1OF and L2OF bands) constellations. Provides advanced anti-spoofing technology with support for the Fugro AtomiChron®
+  BeiDou (B1I, B2I, and B3I) and GLONASS (L1OF and L2OF bands) constellations. Provides advanced anti-spoofing technology with support for the Fugro AtomiChron
   service as well as the Galileo OSNMA service*. Requires a Meinberg GNSS Multi-Band Antenna.
 model: IMS-GXL
 console-ports:
diff --git a/module-types/Schweitzer Engineering Laboratories/SEL-2245-221-Low-Voltage-(LEA)-Monitoring-Module.yml b/module-types/Schweitzer Engineering Laboratories/SEL-2245-221-Low-Voltage-(LEA)-Monitoring-Module.yml
index 8e36e2317..c93f742aa 100644
--- a/module-types/Schweitzer Engineering Laboratories/SEL-2245-221-Low-Voltage-(LEA)-Monitoring-Module.yml	
+++ b/module-types/Schweitzer Engineering Laboratories/SEL-2245-221-Low-Voltage-(LEA)-Monitoring-Module.yml	
@@ -2,7 +2,7 @@
 manufacturer: Schweitzer Engineering Laboratories
 model: SEL-2245-221 Low-Voltage (LEA) Monitoring Module
 description: The SEL-2245-221 module provides four inputs for voltage or current monitoring applications. With four low-voltage input channels, this module
-  can monitor a 0.05–22.0  Vrms ac voltage inputs or ±30 V peak dc voltage measurements. This module supports custom  per-channel calibration to monitor
+  can monitor a 0.05-22.0  Vrms ac voltage inputs or 30 V peak dc voltage measurements. This module supports custom  per-channel calibration to monitor
   current measurement from external current transformers (e.g., split-core CT). In dc mode, it can also capture and record measurements from vital  components
   in the substation (e.g., trip coil currents during breaker operations).  Additionally, the module records waveform oscillography up to 24 kHz and generates  IEEE
   C37.118 synchrophasors.
diff --git a/module-types/Schweitzer Engineering Laboratories/SEL-2245-3-DC-Analog-Output-Module.yml b/module-types/Schweitzer Engineering Laboratories/SEL-2245-3-DC-Analog-Output-Module.yml
index 06d3a20d1..06fd9f970 100644
--- a/module-types/Schweitzer Engineering Laboratories/SEL-2245-3-DC-Analog-Output-Module.yml	
+++ b/module-types/Schweitzer Engineering Laboratories/SEL-2245-3-DC-Analog-Output-Module.yml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Schweitzer Engineering Laboratories
 model: SEL-2245-3 DC Analog Output Module
-description: The SEL-2245-3 module includes eight software-selectable current or voltage outputs. The outputs are self-sourcing from –20 to +20 mA or –10
+description: The SEL-2245-3 module includes eight software-selectable current or voltage outputs. The outputs are self-sourcing from -20 to +20 mA or -10
   to +10 V. This module supports a ramp feature for smooth transitions between set points and supports a clamp feature to prevent driving beyond a desired
   value. A total of two SEL-2245-3 modules can be installed in one SEL-2242 chassis and up to 16 modules in one Axion system. This module is ideal for proportional-integral-derivative
   (PID) output controls, analog meter displays, and analog set point delivery.
diff --git a/module-types/Schweitzer Engineering Laboratories/SEL-2245-4-AC-Metering-Module.yml b/module-types/Schweitzer Engineering Laboratories/SEL-2245-4-AC-Metering-Module.yml
index bfa57d86e..a10ec82ca 100644
--- a/module-types/Schweitzer Engineering Laboratories/SEL-2245-4-AC-Metering-Module.yml	
+++ b/module-types/Schweitzer Engineering Laboratories/SEL-2245-4-AC-Metering-Module.yml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Schweitzer Engineering Laboratories
 model: SEL-2245-4 AC Metering Module
-description: The SEL-2245-4 module includes four CT and four PT inputs with ranges of 0–22 A and 5–400 VL-N at a typical accuracy of 0.1 percent. Up to
+description: The SEL-2245-4 module includes four CT and four PT inputs with ranges of 0-22 A and 5-400 VL-N at a typical accuracy of 0.1 percent. Up to
   9 modules may be used in a node, and a maximum of 16 metering modules may be used in one Axion system, all with synchronized measurements for a common
   reference. Additionally, the module records waveform oscillography up to 24 kHz and generates IEEE C37.118 synchrophasors.
 interfaces:
diff --git a/module-types/Schweitzer Engineering Laboratories/sel-2243-power-coupler.yml b/module-types/Schweitzer Engineering Laboratories/sel-2243-power-coupler.yml
index 166459a3a..c331c4173 100644
--- a/module-types/Schweitzer Engineering Laboratories/sel-2243-power-coupler.yml	
+++ b/module-types/Schweitzer Engineering Laboratories/sel-2243-power-coupler.yml	
@@ -2,7 +2,7 @@
 manufacturer: Schweitzer Engineering Laboratories
 model: SEL-2243 Power Coupler
 description: Every SEL Axion node requires at least one SEL-2243 Power Coupler module. The SEL-2243 serves two purposes in an Axion system. It is the power
-  supply for all modules installed in the node, and; It provides two dedicated EtherCAT® ports so that mutiple Axion nodes can operate together.
+  supply for all modules installed in the node, and; It provides two dedicated EtherCAT ports so that mutiple Axion nodes can operate together.
 
 interfaces:
   - name: Eth01
diff --git a/module-types/Schweitzer Engineering Laboratories/sel-2244-5-fast-high-current-digital-output-module.yml b/module-types/Schweitzer Engineering Laboratories/sel-2244-5-fast-high-current-digital-output-module.yml
index 93ab096af..f339c3e17 100644
--- a/module-types/Schweitzer Engineering Laboratories/sel-2244-5-fast-high-current-digital-output-module.yml	
+++ b/module-types/Schweitzer Engineering Laboratories/sel-2244-5-fast-high-current-digital-output-module.yml	
@@ -2,7 +2,7 @@
 manufacturer: Schweitzer Engineering Laboratories
 model: SEL-2244-5 Fast High-Current Digital Output Module
 description: The SEL-2244-5 module includes ten control outputs with LED indication that have high current tripping capacity (10 A) and fast output rise
-  time (<16 µs at 125 V). Up to nine modules may be used in a node
+  time (<16 at 125 V). Up to nine modules may be used in a node
 
 interfaces:
   - name: Digital-output terminal
diff --git a/module-types/Schweitzer Engineering Laboratories/sel-2245-2-dc-analog-input-module.yml b/module-types/Schweitzer Engineering Laboratories/sel-2245-2-dc-analog-input-module.yml
index 6f3474d04..e7c2b47f2 100644
--- a/module-types/Schweitzer Engineering Laboratories/sel-2245-2-dc-analog-input-module.yml	
+++ b/module-types/Schweitzer Engineering Laboratories/sel-2245-2-dc-analog-input-module.yml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Schweitzer Engineering Laboratories
 model: SEL-2245-2 DC Analog Input Module
-description: The SEL-2245-2 module includes 16 inputs that are software-selectable for input ranges of ±20 mA, ±2 mA, or +10 V. Up to 9 modules may be used
+description: The SEL-2245-2 module includes 16 inputs that are software-selectable for input ranges of 20 mA, 2 mA, or +10 V. Up to 9 modules may be used
   in a node, and a maximum of 16 analog modules may be used in one Axion system.
 
 interfaces:
diff --git a/module-types/Schweitzer Engineering Laboratories/sel-2245-22-dc-analog-input-extended-range-module.yml b/module-types/Schweitzer Engineering Laboratories/sel-2245-22-dc-analog-input-extended-range-module.yml
index 9900e7b09..a3b802d31 100644
--- a/module-types/Schweitzer Engineering Laboratories/sel-2245-22-dc-analog-input-extended-range-module.yml	
+++ b/module-types/Schweitzer Engineering Laboratories/sel-2245-22-dc-analog-input-extended-range-module.yml	
@@ -1,7 +1,7 @@
 ---
 manufacturer: Schweitzer Engineering Laboratories
 model: SEL-2245-22 DC Analog Input Extended-Range Module
-description: The SEL-2245-22 module includes four inputs for measuring 0–300 Vdc signals. This makes them ideal for monitoring battery voltage.
+description: The SEL-2245-22 module includes four inputs for measuring 0-300 Vdc signals. This makes them ideal for monitoring battery voltage.
 interfaces:
   - name: Analog-input terminal
     type: other
diff --git a/module-types/Schweitzer Engineering Laboratories/sel-2245-411-standard-current-and-low-voltage-(lea)-monitoring-module.yml b/module-types/Schweitzer Engineering Laboratories/sel-2245-411-standard-current-and-low-voltage-(lea)-monitoring-module.yml
index 8f177ff14..c22c00be8 100644
--- a/module-types/Schweitzer Engineering Laboratories/sel-2245-411-standard-current-and-low-voltage-(lea)-monitoring-module.yml	
+++ b/module-types/Schweitzer Engineering Laboratories/sel-2245-411-standard-current-and-low-voltage-(lea)-monitoring-module.yml	
@@ -2,8 +2,8 @@
 manufacturer: Schweitzer Engineering Laboratories
 model: SEL-2245-411 Standard Current and Low-Voltage (LEA) Monitoring Module
 description: The SEL-2245-411 module includes the same current inputs as the SEL-2245-4 AC Metering Module with four low-voltage inputs to support low-energy
-  analog (LEA) voltage measurements. Deploy this module to monitor power system measurements using LEA voltage transducers. The module’s LEA channels measure
-  0.05–22.0 Vrms ac voltage inputs. Additionally, the module records waveform oscillography up to 24 kHz and generates IEEE C37.118 synchrophasors.
+  analog (LEA) voltage measurements. Deploy this module to monitor power system measurements using LEA voltage transducers. The module's LEA channels measure
+  0.05-22.0 Vrms ac voltage inputs. Additionally, the module records waveform oscillography up to 24 kHz and generates IEEE C37.118 synchrophasors.
 interfaces:
   - name: 4CT/4LEA Analog inputs
     type: other
diff --git a/module-types/Supermicro/AOC-MCX4121A-ACAT.yaml b/module-types/Supermicro/AOC-MCX4121A-ACAT.yaml
index 4fe3d1d46..a9d627080 100644
--- a/module-types/Supermicro/AOC-MCX4121A-ACAT.yaml
+++ b/module-types/Supermicro/AOC-MCX4121A-ACAT.yaml
@@ -2,7 +2,7 @@
 manufacturer: Supermicro
 model: Add-on Card AOC-MCX4121A-ACAT
 part_number: AOC-MCX4121A-ACAT
-description: Mellanox® ConnectX-4 Lx EN
+description: Mellanox ConnectX-4 Lx EN
 interfaces:
   - name: Ethernet/{module}/1
     type: 25gbase-x-sfp28
diff --git a/module-types/Ubiquiti/UACC-PSU-12V-150W.yaml b/module-types/Ubiquiti/UACC-PSU-12V-150W.yaml
new file mode 100644
index 000000000..584285ac0
--- /dev/null
+++ b/module-types/Ubiquiti/UACC-PSU-12V-150W.yaml
@@ -0,0 +1,9 @@
+---
+manufacturer: Ubiquiti
+model: UACC-PSU-12V-150W
+part_number: UACC-PSU-12V-150W
+comments: '[Ubiquiti PSU-150W](https://techspecs.ui.com/unifi/accessories/uacc-psu-12v-150w) Data Sheet'
+power-ports:
+  - name: PSU {module}
+    type: iec-60320-c14
+    maximum_draw: 150
diff --git a/module-types/Ubiquiti/UACC-PSU-12V-550W.yaml b/module-types/Ubiquiti/UACC-PSU-12V-550W.yaml
new file mode 100644
index 000000000..658e40f11
--- /dev/null
+++ b/module-types/Ubiquiti/UACC-PSU-12V-550W.yaml
@@ -0,0 +1,9 @@
+---
+manufacturer: Ubiquiti
+model: UACC-PSU-12V-550W
+part_number: UACC-PSU-12V-550W
+comments: '[Ubiquiti PSU-550W](https://techspecs.ui.com/unifi/accessories/uacc-psu-12v-550w) Data Sheet'
+power-ports:
+  - name: PSU {module}
+    type: iec-60320-c14
+    maximum_draw: 550
diff --git a/tests/definitions_test.py b/tests/definitions_test.py
index ebd81783c..85701d8af 100644
--- a/tests/definitions_test.py
+++ b/tests/definitions_test.py
@@ -159,7 +159,7 @@ def test_definitions(file_path, schema, change_type):
 
     # Load YAML data from file
     definition = yaml.load(content, Loader=DecimalSafeLoader)
-    
+
     # Check for non-ASCII characters
     non_ascii_chars = [char for char in content if ord(char) > 127]
     if non_ascii_chars:
diff --git a/tests/known-modules.pickle b/tests/known-modules.pickle
index a3957f20c..602c56e4f 100644
Binary files a/tests/known-modules.pickle and b/tests/known-modules.pickle differ
diff --git a/tests/known-slugs.pickle b/tests/known-slugs.pickle
index eee3967d2..1a900a551 100644
Binary files a/tests/known-slugs.pickle and b/tests/known-slugs.pickle differ