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 0000000000..f4bd28e046
--- /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 0000000000..81640b06ff
--- /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/Eltex/esr-15r.yml b/device-types/Eltex/esr-15r.yml
new file mode 100644
index 0000000000..ccc96dd0b4
--- /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/5720-24MW.yaml b/device-types/Extreme Networks/5720-24MW.yaml
new file mode 100644
index 0000000000..012e9427c0
--- /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 0000000000..7f02b701a1
--- /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 0000000000..38fc167b63
--- /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 0000000000..cadd65f781
--- /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/Juniper/EX2200-C-12P.yaml b/device-types/Juniper/EX2200-C-12P.yaml
index 03c2a0df2a..eaeba0cc24 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 775794b52f..6c044385ec 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 e0557ec098..c8a8f598df 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 eb9d31c793..a043023f8f 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 a9570508c3..125b91f921 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 0000000000..bbf4a262cb
--- /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 0000000000..2d9f364bdb
--- /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 0000000000..f6efd88ad9
--- /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 0000000000..ee6608ece0
--- /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 0000000000..ea71331569
--- /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 0000000000..56ed122b2b
--- /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/Planet/POE-2400G.yaml b/device-types/PLANET/POE-2400G.yaml
similarity index 100%
rename from device-types/Planet/POE-2400G.yaml
rename to device-types/PLANET/POE-2400G.yaml
diff --git a/device-types/QNAP/TS-431U.yaml b/device-types/QNAP/TS-431U.yaml
new file mode 100644
index 0000000000..abcbccfe1e
--- /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/module-types/Extreme Networks/5720-VIM-2CE.yaml b/module-types/Extreme Networks/5720-VIM-2CE.yaml
new file mode 100644
index 0000000000..a373330ac4
--- /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 0000000000..922e23a9fb
--- /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/Meinberg/IMS-GXL.yml b/module-types/Meinberg/IMS-GXL.yml
index f21eba8ba4..fff56eb572 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 8e36e23179..c93f742aae 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 06d3a20d1f..06fd9f970b 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 bfa57d86e6..a10ec82cae 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 166459a3a7..c331c4173a 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 93ab096afe..f339c3e172 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 6f3474d046..e7c2b47f27 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 9900e7b099..a3b802d312 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 8f177ff147..c22c00be84 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 4fe3d1d46e..a9d6270806 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/tests/definitions_test.py b/tests/definitions_test.py
index ebd81783c6..85701d8afe 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 3b1528e345..602c56e4f4 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 b7c6b4ab7d..1a900a5518 100644
Binary files a/tests/known-slugs.pickle and b/tests/known-slugs.pickle differ