diff --git a/device-types/Check Point/SG1535.yaml b/device-types/Check Point/SG1535.yaml
new file mode 100644
index 0000000000..f5586ad122
--- /dev/null
+++ b/device-types/Check Point/SG1535.yaml	
@@ -0,0 +1,32 @@
+---
+manufacturer: Check Point
+model: SG1535
+slug: check-point-sg1535
+part_number: CPAP-SG1535
+u_height: 1.0
+is_full_depth: false
+weight: 0.43
+weight_unit: kg
+comments: '[Check Point 1500 Pro Data Sheet](https://www.checkpoint.com/downloads/products/1500-pro-security-gateway-datasheet.pdf)'
+airflow: passive
+power-ports:
+  - name: PSU
+    type: dc-terminal
+    maximum_draw: 40
+    allocated_draw: 18
+console-ports:
+  - name: CONSOLE
+    type: usb-c
+interfaces:
+  - 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: WAN
+    type: 1000base-t
diff --git a/device-types/Check Point/SG1555.yaml b/device-types/Check Point/SG1555.yaml
new file mode 100644
index 0000000000..7bb7028abf
--- /dev/null
+++ b/device-types/Check Point/SG1555.yaml	
@@ -0,0 +1,32 @@
+---
+manufacturer: Check Point
+model: SG1555
+slug: check-point-sg1555
+part_number: CPAP-SG1555
+u_height: 1.0
+is_full_depth: false
+weight: 0.43
+weight_unit: kg
+comments: '[Check Point 1500 Pro Data Sheet](https://www.checkpoint.com/downloads/products/1500-pro-security-gateway-datasheet.pdf)'
+airflow: passive
+power-ports:
+  - name: PSU
+    type: dc-terminal
+    maximum_draw: 40
+    allocated_draw: 18
+console-ports:
+  - name: CONSOLE
+    type: usb-c
+interfaces:
+  - 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: WAN
+    type: 1000base-t
diff --git a/device-types/Check Point/SG1595.yaml b/device-types/Check Point/SG1595.yaml
new file mode 100644
index 0000000000..f43ab591cb
--- /dev/null
+++ b/device-types/Check Point/SG1595.yaml	
@@ -0,0 +1,42 @@
+---
+manufacturer: Check Point
+model: SG1595
+slug: check-point-sg1595
+part_number: CPAP-SG1595
+u_height: 1.0
+is_full_depth: false
+weight: 0.87
+weight_unit: kg
+comments: '[Check Point 1500 Pro Data Sheet](https://www.checkpoint.com/downloads/products/1500-pro-security-gateway-datasheet.pdf)'
+airflow: passive
+power-ports:
+  - name: PSU
+    type: dc-terminal
+    maximum_draw: 60
+    allocated_draw: 40
+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/SG2530.yaml b/device-types/Check Point/SG2530.yaml
new file mode 100644
index 0000000000..1c1bbc8b09
--- /dev/null
+++ b/device-types/Check Point/SG2530.yaml	
@@ -0,0 +1,40 @@
+---
+manufacturer: Check Point
+model: SG2530
+slug: check-point-sg2530
+part_number: CPAP-SG2530
+u_height: 1.0
+is_full_depth: false
+weight: 0.87
+weight_unit: kg
+comments: '[Check Point Quantum Spark 2500 Data Sheet](https://www.checkpoint.com/downloads/products/quantum-spark-2500-datasheet.pdf)'
+airflow: passive
+power-ports:
+  - name: PSU
+    type: dc-terminal
+    maximum_draw: 40
+    allocated_draw: 26
+console-ports:
+  - name: CONSOLE
+    type: usb-c
+interfaces:
+  - name: WAN-RJ-45
+    type: 1000base-t
+  - name: WAN-SFP
+    type: 1000base-x-sfp
+  - 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
diff --git a/device-types/Check Point/SG2550.yaml b/device-types/Check Point/SG2550.yaml
new file mode 100644
index 0000000000..0b2399c947
--- /dev/null
+++ b/device-types/Check Point/SG2550.yaml	
@@ -0,0 +1,40 @@
+---
+manufacturer: Check Point
+model: SG2550
+slug: check-point-sg2550
+part_number: CPAP-SG2550
+u_height: 1.0
+is_full_depth: false
+weight: 0.87
+weight_unit: kg
+comments: '[Check Point Quantum Spark 2500 Data Sheet](https://www.checkpoint.com/downloads/products/quantum-spark-2500-datasheet.pdf)'
+airflow: passive
+power-ports:
+  - name: PSU
+    type: dc-terminal
+    maximum_draw: 40
+    allocated_draw: 26
+console-ports:
+  - name: CONSOLE
+    type: usb-c
+interfaces:
+  - name: WAN-RJ-45
+    type: 1000base-t
+  - name: WAN-SFP
+    type: 1000base-x-sfp
+  - 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
diff --git a/device-types/Check Point/SG2560.yaml b/device-types/Check Point/SG2560.yaml
new file mode 100644
index 0000000000..81061a713a
--- /dev/null
+++ b/device-types/Check Point/SG2560.yaml	
@@ -0,0 +1,48 @@
+---
+manufacturer: Check Point
+model: SG2560
+slug: check-point-sg2560
+part_number: CPAP-SG2560
+u_height: 1.0
+is_full_depth: false
+weight: 0.87
+weight_unit: kg
+comments: '[Check Point Quantum Spark 2500 Data Sheet](https://www.checkpoint.com/downloads/products/quantum-spark-2500-datasheet.pdf)'
+airflow: passive
+power-ports:
+  - name: PSU1
+    type: dc-terminal
+    maximum_draw: 60
+    allocated_draw: 40
+  - name: PSU2
+    type: dc-terminal
+    maximum_draw: 60
+    allocated_draw: 40
+console-ports:
+  - name: CONSOLE
+    type: usb-c
+interfaces:
+  - name: WAN
+    type: 1000base-t
+  - name: DMZ
+    type: 1000base-x-sfp
+  - name: X1
+    type: 10gbase-x-sfpp
+  - name: X2
+    type: 10gbase-x-sfpp
+  - 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
diff --git a/device-types/Check Point/SG2570.yaml b/device-types/Check Point/SG2570.yaml
new file mode 100644
index 0000000000..af5535ce14
--- /dev/null
+++ b/device-types/Check Point/SG2570.yaml	
@@ -0,0 +1,48 @@
+---
+manufacturer: Check Point
+model: SG2570
+slug: check-point-sg2570
+part_number: CPAP-SG2570
+u_height: 1.0
+is_full_depth: false
+weight: 0.87
+weight_unit: kg
+comments: '[Check Point Quantum Spark 2500 Data Sheet](https://www.checkpoint.com/downloads/products/quantum-spark-2500-datasheet.pdf)'
+airflow: passive
+power-ports:
+  - name: PSU1
+    type: dc-terminal
+    maximum_draw: 60
+    allocated_draw: 40
+  - name: PSU2
+    type: dc-terminal
+    maximum_draw: 60
+    allocated_draw: 40
+console-ports:
+  - name: CONSOLE
+    type: usb-c
+interfaces:
+  - name: WAN
+    type: 1000base-t
+  - name: DMZ
+    type: 1000base-x-sfp
+  - name: X1
+    type: 10gbase-x-sfpp
+  - name: X2
+    type: 10gbase-x-sfpp
+  - 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
diff --git a/device-types/Check Point/SG2580.yaml b/device-types/Check Point/SG2580.yaml
new file mode 100644
index 0000000000..978bd67210
--- /dev/null
+++ b/device-types/Check Point/SG2580.yaml	
@@ -0,0 +1,54 @@
+---
+manufacturer: Check Point
+model: SG2580
+slug: check-point-sg2580
+part_number: CPAP-SG2580
+u_height: 1.0
+is_full_depth: false
+weight: 0.98
+weight_unit: kg
+comments: '[Check Point Quantum Spark 2500 Data Sheet](https://www.checkpoint.com/downloads/products/quantum-spark-2500-datasheet.pdf)'
+airflow: front-to-rear
+power-ports:
+  - name: PSU1
+    type: dc-terminal
+    maximum_draw: 60
+    allocated_draw: 40
+  - name: PSU2
+    type: dc-terminal
+    maximum_draw: 60
+    allocated_draw: 40
+console-ports:
+  - name: CONSOLE-U
+    type: usb-c
+  - name: CONSOLE-S
+    type: rj-45
+interfaces:
+  - name: WAN-RJ-45
+    type: 10gbase-t
+  - name: WAN-SFP+
+    type: 10gbase-x-sfpp
+  - name: DMZ-RJ-45
+    type: 10gbase-t
+  - name: DMZ-SFP+
+    type: 10gbase-x-sfpp
+  - name: '1'
+    type: 2.5gbase-t
+  - name: '2'
+    type: 2.5gbase-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
diff --git a/device-types/Check Point/SG29100.yaml b/device-types/Check Point/SG29100.yaml
new file mode 100644
index 0000000000..d64658050d
--- /dev/null
+++ b/device-types/Check Point/SG29100.yaml	
@@ -0,0 +1,49 @@
+---
+manufacturer: Check Point
+model: SG29100
+slug: check-point-sg29100
+part_number: CPAP-SG29100
+u_height: 2.0
+is_full_depth: true
+weight: 18.8
+weight_unit: kg
+comments: '[Check Point Quantum Force 29100 Data Sheet](https://www.checkpoint.com/downloads/products/quantum-force-29100-datasheet.pdf)'
+airflow: front-to-rear
+console-ports:
+  - name: Console1
+    type: rj-45
+  - name: Console2
+    type: usb-c
+interfaces:
+  - name: LOM
+    type: 1000base-t
+    mgmt_only: true
+  - name: MGMT1
+    type: 10gbase-t
+    mgmt_only: true
+  - name: MGMT2
+    type: 10gbase-t
+    mgmt_only: true
+  - name: SYNC1
+    type: 25gbase-x-sfp28
+  - name: SYNC2
+    type: 25gbase-x-sfp28
+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: PSU1
+    position: PSU1
+  - name: PSU2
+    position: PSU2
diff --git a/device-types/Check Point/SG29200.yaml b/device-types/Check Point/SG29200.yaml
new file mode 100644
index 0000000000..46f94c2959
--- /dev/null
+++ b/device-types/Check Point/SG29200.yaml	
@@ -0,0 +1,49 @@
+---
+manufacturer: Check Point
+model: SG29200
+slug: check-point-sg29200
+part_number: CPAP-SG29200
+u_height: 2.0
+is_full_depth: true
+weight: 19.1
+weight_unit: kg
+comments: '[Check Point Quantum Force 29200 Data Sheet](https://www.checkpoint.com/downloads/products/quantum-force-29200-datasheet.pdf)'
+airflow: front-to-rear
+console-ports:
+  - name: Console1
+    type: rj-45
+  - name: Console2
+    type: usb-c
+interfaces:
+  - name: LOM
+    type: 1000base-t
+    mgmt_only: true
+  - name: MGMT1
+    type: 10gbase-t
+    mgmt_only: true
+  - name: MGMT2
+    type: 10gbase-t
+    mgmt_only: true
+  - name: SYNC1
+    type: 25gbase-x-sfp28
+  - name: SYNC2
+    type: 25gbase-x-sfp28
+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: PSU1
+    position: PSU1
+  - name: PSU2
+    position: PSU2
diff --git a/device-types/Cisco/C9300L-48T-4X.yaml b/device-types/Cisco/C9300L-48T-4X.yaml
new file mode 100644
index 0000000000..543fc7d31c
--- /dev/null
+++ b/device-types/Cisco/C9300L-48T-4X.yaml
@@ -0,0 +1,139 @@
+---
+manufacturer: Cisco
+model: Catalyst 9300L-48T-4X
+part_number: C9300L-48T-4X
+slug: cisco-c9300l-48t-4x
+u_height: 1
+is_full_depth: true
+weight: 7
+weight_unit: kg
+airflow: front-to-rear
+comments: '[Cisco Catalyst 9300 Series Switches Data Sheet](https://www.cisco.com/c/en/us/products/collateral/switches/catalyst-9300-series-switches/nb-06-cat9300-ser-data-sheet-cte-en.html)'
+console-ports:
+  - name: con 0
+    type: rj-45
+  - name: usb
+    type: usb-mini-b
+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/21
+    type: 1000base-t
+  - name: GigabitEthernet1/0/22
+    type: 1000base-t
+  - name: GigabitEthernet1/0/23
+    type: 1000base-t
+  - name: GigabitEthernet1/0/24
+    type: 1000base-t
+  - name: GigabitEthernet1/0/25
+    type: 1000base-t
+  - name: GigabitEthernet1/0/26
+    type: 1000base-t
+  - name: GigabitEthernet1/0/27
+    type: 1000base-t
+  - name: GigabitEthernet1/0/28
+    type: 1000base-t
+  - name: GigabitEthernet1/0/29
+    type: 1000base-t
+  - name: GigabitEthernet1/0/30
+    type: 1000base-t
+  - name: GigabitEthernet1/0/31
+    type: 1000base-t
+  - name: GigabitEthernet1/0/32
+    type: 1000base-t
+  - name: GigabitEthernet1/0/33
+    type: 1000base-t
+  - name: GigabitEthernet1/0/34
+    type: 1000base-t
+  - name: GigabitEthernet1/0/35
+    type: 1000base-t
+  - name: GigabitEthernet1/0/36
+    type: 1000base-t
+  - name: GigabitEthernet1/0/37
+    type: 1000base-t
+  - name: GigabitEthernet1/0/38
+    type: 1000base-t
+  - name: GigabitEthernet1/0/39
+    type: 1000base-t
+  - name: GigabitEthernet1/0/40
+    type: 1000base-t
+  - name: GigabitEthernet1/0/41
+    type: 1000base-t
+  - name: GigabitEthernet1/0/42
+    type: 1000base-t
+  - name: GigabitEthernet1/0/43
+    type: 1000base-t
+  - name: GigabitEthernet1/0/44
+    type: 1000base-t
+  - name: GigabitEthernet1/0/45
+    type: 1000base-t
+  - name: GigabitEthernet1/0/46
+    type: 1000base-t
+  - name: GigabitEthernet1/0/47
+    type: 1000base-t
+  - name: GigabitEthernet1/0/48
+    type: 1000base-t
+  - name: TenGigabitEthernet1/1/1
+    type: 10gbase-x-sfpp
+  - name: TenGigabitEthernet1/1/2
+    type: 10gbase-x-sfpp
+  - name: TenGigabitEthernet1/1/3
+    type: 10gbase-x-sfpp
+  - name: TenGigabitEthernet1/1/4
+    type: 10gbase-x-sfpp
+  - name: StackPort1/1
+    type: cisco-stackwise
+  - name: StackPort1/2
+    type: cisco-stackwise
+  - name: GigabitEthernet0/0
+    type: 1000base-t
+    mgmt_only: true
+module-bays:
+  - name: PS-A
+    position: A
+  - name: PS-B
+    position: B
+  - name: FAN 1
+    position: '1'
+  - name: FAN 2
+    position: '2'
+  - name: FAN 3
+    position: '3'
diff --git a/device-types/Cisco/N9324C-SE1U.yaml b/device-types/Cisco/N9324C-SE1U.yaml
new file mode 100644
index 0000000000..d1579fe2fb
--- /dev/null
+++ b/device-types/Cisco/N9324C-SE1U.yaml
@@ -0,0 +1,86 @@
+---
+manufacturer: Cisco
+model: N9324C-SE1U
+part_number: N9324C-SE1U
+slug: cisco-n9324c-se1u
+u_height: 1
+is_full_depth: true
+weight: 36.8
+weight_unit: lb
+comments: '[Cisco N9300 Smart Switches Datasheet](https://www.cisco.com/c/en/us/products/collateral/switches/9300-series-smart-switches/n9300-series-smart-switch-ds.html)'
+console-ports:
+  - name: console
+    type: rj-45
+  - name: usb1
+    type: usb-c
+interfaces:
+  - name: Ethernet1/1
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/2
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/3
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/4
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/5
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/6
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/7
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/8
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/9
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/10
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/11
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/12
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/13
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/14
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/15
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/16
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/17
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/18
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/19
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/20
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/21
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/22
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/23
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/24
+    type: 100gbase-x-qsfp28
+  - name: mgmt0
+    type: 1000base-x-sfp
+    mgmt_only: true
+module-bays:
+  - name: PS1
+    label: Power Supply 1
+    position: PS1
+  - name: PS2
+    label: Power Supply 2
+    position: PS2
+  - name: Fan 1
+    position: F1
+  - name: Fan 2
+    position: F2
+  - name: Fan 3
+    position: F3
+  - name: Fan 4
+    position: F4
+  - name: Fan 5
+    position: F5
+  - name: Fan 6
+    position: F6
diff --git a/device-types/Cisco/N9348Y2C6D-SE1U.yaml b/device-types/Cisco/N9348Y2C6D-SE1U.yaml
new file mode 100644
index 0000000000..c4f270a676
--- /dev/null
+++ b/device-types/Cisco/N9348Y2C6D-SE1U.yaml
@@ -0,0 +1,147 @@
+---
+manufacturer: Cisco
+model: N9348Y2C6D-SE1U
+slug: cisco-n9348y2c6d-se1u
+part_number: N9348Y2C6D-SE1U
+u_height: 1
+is_full_depth: true
+weight: 36.8
+weight_unit: lb
+comments: '[Cisco N9300 Smart Switches Datasheet](https://www.cisco.com/c/en/us/products/collateral/switches/9300-series-smart-switches/n9300-series-smart-switch-ds.html)'
+console-ports:
+  - name: con 0
+    type: rj-45
+  - name: usb
+    type: usb-c
+module-bays:
+  - name: PS-0
+    position: PS-0
+  - name: PS-1
+    position: PS-1
+  - name: Fan 1
+    position: F1
+  - name: Fan 2
+    position: F2
+  - name: Fan 3
+    position: F3
+  - name: Fan 4
+    position: F4
+  - name: Fan 5
+    position: F5
+  - name: Fan 6
+    position: F6
+interfaces:
+  - name: mgmt0
+    type: 10gbase-x-sfpp
+    mgmt_only: true
+  - name: mgmt1
+    type: 10gbase-x-sfpp
+    mgmt_only: true
+  - name: Ethernet1/1
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/2
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/3
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/4
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/5
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/6
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/7
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/8
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/9
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/10
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/11
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/12
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/13
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/14
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/15
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/16
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/17
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/18
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/19
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/20
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/21
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/22
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/23
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/24
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/25
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/26
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/27
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/28
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/29
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/30
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/31
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/32
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/33
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/34
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/35
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/36
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/37
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/38
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/39
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/40
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/41
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/42
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/43
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/44
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/45
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/46
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/47
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/48
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/49
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/50
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/51
+    type: 400gbase-x-qsfp112
+  - name: Ethernet1/52
+    type: 400gbase-x-qsfp112
+  - name: Ethernet1/53
+    type: 400gbase-x-qsfp112
+  - name: Ethernet1/54
+    type: 400gbase-x-qsfp112
diff --git a/device-types/Cisco/N9K-C93180YC-FX3.yaml b/device-types/Cisco/N9K-C93180YC-FX3.yaml
index 64cf2db985..0f09156af3 100644
--- a/device-types/Cisco/N9K-C93180YC-FX3.yaml
+++ b/device-types/Cisco/N9K-C93180YC-FX3.yaml
@@ -9,6 +9,7 @@ u_height: 1
 weight: 9.52
 weight_unit: kg
 is_full_depth: true
+comments: '[Cisco Nexus 9300 Datacenter Switches Datasheet](https://www.cisco.com/c/en/us/products/collateral/switches/nexus-9000-series-switches/datasheet-c78-744052.html)'
 console-ports:
   - name: console
     type: rj-45
@@ -128,16 +129,16 @@ interfaces:
     mgmt_only: true
 module-bays:
   - name: PS1
-    position: '1'
+    position: PS1
     label: Power Supply 1
   - name: PS2
-    position: '2'
+    position: PS2
     label: Power Supply 2
   - name: Fan 1
-    position: '1'
+    position: F1
   - name: Fan 2
-    position: '2'
+    position: F2
   - name: Fan 3
-    position: '3'
+    position: F3
   - name: Fan 4
-    position: '4'
+    position: F4
diff --git a/device-types/Cisco/N9K-C9336C-FX2.yaml b/device-types/Cisco/N9K-C9336C-FX2.yaml
index c671981400..fce6878bb4 100644
--- a/device-types/Cisco/N9K-C9336C-FX2.yaml
+++ b/device-types/Cisco/N9K-C9336C-FX2.yaml
@@ -9,6 +9,7 @@ u_height: 1
 is_full_depth: true
 weight: 8.5
 weight_unit: kg
+comments: '[Cisco Nexus 9300 Datacenter FX2 Switches Datasheet](https://www.cisco.com/c/en/us/products/collateral/switches/nexus-9000-series-switches/datasheet-c78-742282.html)'
 console-ports:
   - name: console
     type: rj-45
@@ -90,16 +91,19 @@ interfaces:
   - name: mgmt0
     type: 1000base-t
     mgmt_only: true
+  - name: mgmt1
+    type: 1000base-x-sfp
+    mgmt_only: true
 module-bays:
   - name: PS1
     label: Power Supply 1
-    position: '1'
+    position: PS1
   - name: PS2
     label: Power Supply 2
-    position: '2'
+    position: PS2
   - name: Fan 1
-    position: '1'
+    position: F1
   - name: Fan 2
-    position: '2'
+    position: F2
   - name: Fan 3
-    position: '3'
+    position: F3
diff --git a/device-types/Cisco/WS-C2960-24PC-L.yaml b/device-types/Cisco/WS-C2960-24PC-L.yaml
index c2153d5d1a..fafc2e7a84 100644
--- a/device-types/Cisco/WS-C2960-24PC-L.yaml
+++ b/device-types/Cisco/WS-C2960-24PC-L.yaml
@@ -5,6 +5,10 @@ part_number: WS-C2960-24PC-L
 slug: cisco-ws-c2960-24pc-l
 u_height: 1
 is_full_depth: true
+comments: '[Cisco 2960 Switch Series Datasheet](https://www.cisco.com/c/dam/en_us/solutions/small-business/products/routers-switches/catalyst-2960-series-switches/C78-481303-01_2960-LAN_DS_v1a.pdf)'
+weight: 5.4
+weight_unit: kg
+airflow: side-to-rear
 console-ports:
   - name: con 0
     type: rj-45
diff --git a/device-types/Cisco/WS-C2960C-12PC-L.yaml b/device-types/Cisco/WS-C2960C-12PC-L.yaml
index c67e946685..3ed9f720c2 100644
--- a/device-types/Cisco/WS-C2960C-12PC-L.yaml
+++ b/device-types/Cisco/WS-C2960C-12PC-L.yaml
@@ -4,6 +4,8 @@ model: Catalyst 2960-12PC-L
 slug: cisco-ws-c2960c-12pc-l
 part_number: WS-C2960C-12PC-L
 is_full_depth: false
+weight: 1.86
+airflow: passive
 u_height: 1
 interfaces:
   - name: FastEthernet0/1
diff --git a/device-types/Cisco/WS-C2960XR-48FPS-I.yaml b/device-types/Cisco/WS-C2960XR-48FPS-I.yaml
index 8ef0d04f05..3833c2c6a3 100644
--- a/device-types/Cisco/WS-C2960XR-48FPS-I.yaml
+++ b/device-types/Cisco/WS-C2960XR-48FPS-I.yaml
@@ -5,7 +5,10 @@ slug: cisco-ws-c2960xr-48fps-i
 part_number: WS-C2960XR-48FPS-I
 is_full_depth: false
 u_height: 1
-comments: IP Lite feature set
+comments: '[Cisco 2960X Switch Series Datasheet](https://www.cisco.com/c/en/us/products/collateral/switches/catalyst-2960-x-series-switches/datasheet_c78-728232.html)'
+weight: 6.7
+weight_unit: kg
+airflow: side-to-rear
 interfaces:
   - name: FastEthernet0
     type: 100base-tx
diff --git a/device-types/HPE/Aruba-2620-24-PPoEP.yaml b/device-types/HPE/Aruba-2620-24-PPoEP.yaml
new file mode 100644
index 0000000000..38cfa3c29a
--- /dev/null
+++ b/device-types/HPE/Aruba-2620-24-PPoEP.yaml
@@ -0,0 +1,98 @@
+---
+manufacturer: HPE
+model: Aruba 2620-24-PPoE+
+slug: hpe-aruba-2620-24-ppoep
+part_number: J9624A
+u_height: 1
+is_full_depth: false
+weight: 3.19
+weight_unit: kg
+comments: '[HPE Aruba 2620 Switch 12x100Mbit+12x100MbitPOE, 128W total](https://www.hpe.com/psnow/doc/c04111491.pdf?jumpid=in_lit-psnow-getpdf)'
+console-ports:
+  - name: console
+    type: rj-45
+power-ports:
+  - name: PS1
+    type: iec-60320-c14
+    maximum_draw: 167
+interfaces:
+  - name: '1'
+    type: 100base-tx
+  - name: '2'
+    type: 100base-tx
+  - name: '3'
+    type: 100base-tx
+  - name: '4'
+    type: 100base-tx
+  - name: '5'
+    type: 100base-tx
+  - name: '6'
+    type: 100base-tx
+  - name: '7'
+    type: 100base-tx
+  - name: '8'
+    type: 100base-tx
+  - name: '9'
+    type: 100base-tx
+  - name: '10'
+    type: 100base-tx
+  - name: '11'
+    type: 100base-tx
+  - name: '12'
+    type: 100base-tx
+  - name: '13'
+    type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
+  - name: '14'
+    type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
+  - name: '15'
+    type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
+  - name: '16'
+    type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
+  - name: '17'
+    type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
+  - name: '18'
+    type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
+  - name: '19'
+    type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
+  - name: '20'
+    type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
+  - name: '21'
+    type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
+  - name: '22'
+    type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
+  - name: '23'
+    type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
+  - name: '24'
+    type: 100base-tx
+    poe_type: type2-ieee802.3at
+    poe_mode: pse
+  - name: '25'
+    type: 1000base-t
+  - name: '26'
+    type: 1000base-t
+  - name: '27'
+    type: 1000base-x-sfp
+  - name: '28'
+    type: 1000base-x-sfp
diff --git a/device-types/Huawei/S1720-28GWR-PWR-4TP-E.yaml b/device-types/Huawei/S1720-28GWR-PWR-4TP-E.yaml
index 8e761a8656..613de0c600 100644
--- a/device-types/Huawei/S1720-28GWR-PWR-4TP-E.yaml
+++ b/device-types/Huawei/S1720-28GWR-PWR-4TP-E.yaml
@@ -6,6 +6,8 @@ part_number: '98010752'
 u_height: 1
 is_full_depth: false
 airflow: passive
+weight: 3.57
+weight_unit: kg
 power-ports:
   - name: PWR
     label: '~100/240V; 50/60Hz: 3A'
diff --git a/device-types/MikroTik/RB760iGS.yaml b/device-types/MikroTik/RB760iGS.yaml
index b3fd6d30bb..f1f07173aa 100644
--- a/device-types/MikroTik/RB760iGS.yaml
+++ b/device-types/MikroTik/RB760iGS.yaml
@@ -5,6 +5,8 @@ slug: mikrotik-rb760igs
 part_number: RB760iGS
 u_height: 0
 is_full_depth: false
+weight: 139
+weight_unit: g
 airflow: passive
 comments: "[Mikrotik Product Website](https://mikrotik.com/product/hex_s)\r\nMaximum CPU Network bandwidth is 2GBit/s, see block diagram on Website"
 power-ports:
diff --git a/device-types/TFortis/PSW-2G4F.yaml b/device-types/TFortis/PSW-2G4F.yaml
new file mode 100644
index 0000000000..1b595da5e1
--- /dev/null
+++ b/device-types/TFortis/PSW-2G4F.yaml
@@ -0,0 +1,35 @@
+---
+manufacturer: TFortis
+model: PSW-2G4F
+slug: tfortis-psw-2g4f
+u_height: 2
+is_full_depth: false
+weight: 1.3
+airflow: passive
+weight_unit: kg
+comments: '[TFortis Outdoor Switch Series](https://tfortis.ru/support/snyato-s-proizvodstva/kommutatory/psw-2g4f/)'
+power-ports:
+  - name: PS
+    type: dc-terminal
+    maximum_draw: 120
+interfaces:
+  - name: eth1
+    type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
+  - name: eth2
+    type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
+  - name: eth3
+    type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
+  - name: eth4
+    type: 100base-tx
+    poe_type: type1-ieee802.3af
+    poe_mode: pse
+  - name: sfp5
+    type: 1000base-x-sfp
+  - name: sfp6
+    type: 1000base-x-sfp
diff --git a/module-types/Check Point/CPAC-2-40-100F-D.yaml b/module-types/Check Point/CPAC-2-40-100F-D.yaml
new file mode 100644
index 0000000000..388a967371
--- /dev/null
+++ b/module-types/Check Point/CPAC-2-40-100F-D.yaml	
@@ -0,0 +1,12 @@
+---
+manufacturer: Check Point
+model: CPAC-2-40/100F-D
+part_number: CPAC-2-40/100F-D
+comments: 2 Port 10/25/40/100G Base-F QSFP28 interface card for 19000/29000 appliances
+interfaces:
+  - name: eth{module}-01
+    label: '1'
+    type: 100gbase-x-qsfp28
+  - name: eth{module}-02
+    label: '2'
+    type: 100gbase-x-qsfp28
diff --git a/module-types/Check Point/CPAC-4-10-25F-D.yaml b/module-types/Check Point/CPAC-4-10-25F-D.yaml
new file mode 100644
index 0000000000..1877d14d2d
--- /dev/null
+++ b/module-types/Check Point/CPAC-4-10-25F-D.yaml	
@@ -0,0 +1,18 @@
+---
+manufacturer: Check Point
+model: CPAC-4-10/25F-D
+part_number: CPAC-4-10/25F-D
+comments: 4 Port 10/25GBase-F SFP+ interface card for 19000/29000 appliances
+interfaces:
+  - name: eth{module}-01
+    label: '1'
+    type: 25gbase-x-sfp28
+  - name: eth{module}-02
+    label: '2'
+    type: 25gbase-x-sfp28
+  - name: eth{module}-03
+    label: '3'
+    type: 25gbase-x-sfp28
+  - name: eth{module}-04
+    label: '4'
+    type: 25gbase-x-sfp28
diff --git a/module-types/Check Point/CPAC-8-1-10F-D.yaml b/module-types/Check Point/CPAC-8-1-10F-D.yaml
new file mode 100644
index 0000000000..1ea95e940a
--- /dev/null
+++ b/module-types/Check Point/CPAC-8-1-10F-D.yaml	
@@ -0,0 +1,30 @@
+---
+manufacturer: Check Point
+model: CPAC-8-1/10F-D
+part_number: CPAC-8-1/10F-D
+comments: 8 Port 10GBase-F SFP+ interface card for 19000/29000 appliances
+interfaces:
+  - name: eth{module}-01
+    label: '1'
+    type: 10gbase-x-sfpp
+  - name: eth{module}-02
+    label: '2'
+    type: 10gbase-x-sfpp
+  - name: eth{module}-03
+    label: '3'
+    type: 10gbase-x-sfpp
+  - name: eth{module}-04
+    label: '4'
+    type: 10gbase-x-sfpp
+  - name: eth{module}-05
+    label: '5'
+    type: 10gbase-x-sfpp
+  - name: eth{module}-06
+    label: '6'
+    type: 10gbase-x-sfpp
+  - name: eth{module}-07
+    label: '7'
+    type: 10gbase-x-sfpp
+  - name: eth{module}-08
+    label: '8'
+    type: 10gbase-x-sfpp
diff --git a/module-types/Check Point/CPAC-PSU-AC-19000.yaml b/module-types/Check Point/CPAC-PSU-AC-19000.yaml
new file mode 100644
index 0000000000..da7b2abebc
--- /dev/null
+++ b/module-types/Check Point/CPAC-PSU-AC-19000.yaml	
@@ -0,0 +1,11 @@
+---
+manufacturer: Check Point
+model: CPAC-PSU-AC-19000
+part_number: CPAC-PSU-AC-19000
+comments: Replacement AC Power Supply for 19000/29000 appliances
+power-ports:
+  - name: PSU-{module}
+    type: iec-60320-c14
+    maximum_draw: 1300
+    description: 100-240VAC
+    allocated_draw: 999
diff --git a/module-types/Cisco/NXA-PAC-1400W-PI.yaml b/module-types/Cisco/NXA-PAC-1400W-PI.yaml
new file mode 100644
index 0000000000..10f0498a8e
--- /dev/null
+++ b/module-types/Cisco/NXA-PAC-1400W-PI.yaml
@@ -0,0 +1,9 @@
+---
+manufacturer: Cisco
+model: NXA-PAC-1400W-PI
+part_number: NXA-PAC-1400W-PI
+description: Cisco Nexus 9300 Smart AC Power supply
+power-ports:
+  - name: PSU{module}
+    type: iec-60320-c14
+    maximum_draw: 1400
diff --git a/module-types/HPE/38995-B21.yaml b/module-types/HPE/38995-B21.yaml
deleted file mode 100644
index 198b9d091b..0000000000
--- a/module-types/HPE/38995-B21.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-manufacturer: HPE
-model: HPE PSU 800W Flex Slot Platinum Power Supply
-part_number: 38995-B21
-description: 800W Flex Slot Platinum Power Supply Kit for ProLiant G11
-weight: 1.2
-weight_unit: kg
-power-ports:
-  - name: '{module}'
-    type: iec-60320-c14
-    maximum_draw: 800
diff --git a/module-types/HPE/P38995-B21.yaml b/module-types/HPE/P38995-B21.yaml
new file mode 100644
index 0000000000..124162e85c
--- /dev/null
+++ b/module-types/HPE/P38995-B21.yaml
@@ -0,0 +1,11 @@
+---
+manufacturer: HPE
+model: HPE 800W Hot Plug Power Supply
+part_number: P38995-B21
+description: HPE Proliant G11 servers 800W PSU
+weight: 1
+weight_unit: kg
+power-ports:
+  - name: '{module}'
+    type: iec-60320-c14
+    maximum_draw: 800
diff --git a/module-types/HPE/P45476-B21.yaml b/module-types/HPE/P45476-B21.yaml
new file mode 100644
index 0000000000..55be036e16
--- /dev/null
+++ b/module-types/HPE/P45476-B21.yaml
@@ -0,0 +1,11 @@
+---
+manufacturer: HPE
+model: HPE 290W Single Platinum Power Supply
+part_number: P45476-B21
+description: Single PSU for HPE Proliant DL20 G10 Plus server
+weight: 1
+weight_unit: kg
+power-ports:
+  - name: '{module}'
+    type: iec-60320-c14
+    maximum_draw: 290