diff --git a/device-types/Cisco/N3K-C3064PQ-10GE.yaml b/device-types/Cisco/N3K-C3064PQ-10GE.yaml
index b5051bb48..8dd4badca 100644
--- a/device-types/Cisco/N3K-C3064PQ-10GE.yaml
+++ b/device-types/Cisco/N3K-C3064PQ-10GE.yaml
@@ -1,7 +1,7 @@
 ---
 manufacturer: Cisco
 model: Nexus C3064PQ-10GE
-slug: cisco-nexus-c3064pq-10ge
+slug: cisco-n3k-c3064pq-10ge
 part_number: N3K-C3064PQ-10GE
 u_height: 1
 is_full_depth: false
diff --git a/device-types/Datacom/DM2104-2GX.yaml b/device-types/Datacom/DM2104-2GX.yaml
new file mode 100644
index 000000000..66a74afd2
--- /dev/null
+++ b/device-types/Datacom/DM2104-2GX.yaml
@@ -0,0 +1,37 @@
+---
+manufacturer: Datacom
+model: DM2104-2GX
+slug: datacom-dm2104-2gx
+u_height: 1.0
+is_full_depth: true
+airflow: front-to-rear
+comments: Reference Datacom DM2104-2GX (https://datacom.com.br/uploads/product/file/d3cab58619e13eedda9def507a9a9b57.pdf)
+weight: 1.0
+weight_unit: kg
+console-ports:
+  - name: Console0
+    type: rj-45
+power-ports:
+  - name: Power Input AC/DC
+    type: iec-60320-c14
+    maximum_draw: 20
+interfaces:
+  - name: eth1
+    type: 1000base-x-sfp
+  - name: eth2
+    type: 1000base-x-sfp
+  - name: eth3
+    type: 1000base-tx
+  - name: eth4
+    type: 1000base-tx
+  - name: eth5
+    type: 1000base-tx
+  - name: eth6
+    type: 1000base-tx
+  - name: eth7
+    type: 1000base-tx
+  - name: eth8
+    type: 1000base-tx
+  - name: MGMT
+    type: 100base-tx
+    mgmt_only: true
diff --git a/device-types/Datacom/DM2104-4GX.yaml b/device-types/Datacom/DM2104-4GX.yaml
new file mode 100644
index 000000000..f6228e2df
--- /dev/null
+++ b/device-types/Datacom/DM2104-4GX.yaml
@@ -0,0 +1,41 @@
+---
+manufacturer: Datacom
+model: DM2104-4GX
+slug: datacom-dm2104-4gx
+u_height: 1.0
+is_full_depth: true
+airflow: front-to-rear
+comments: Reference Datacom DM2104-4GX (https://datacom.com.br/uploads/product/file/d3cab58619e13eedda9def507a9a9b57.pdf)
+weight: 1.0
+weight_unit: kg
+console-ports:
+  - name: Console0
+    type: rj-45
+power-ports:
+  - name: Power Input AC/DC
+    type: iec-60320-c14
+    maximum_draw: 20
+interfaces:
+  - name: eth1
+    type: 1000base-x-sfp
+  - name: eth2
+    type: 1000base-x-sfp
+  - name: eth3
+    type: 1000base-x-sfp
+  - name: eth4
+    type: 1000base-x-sfp
+  - name: eth5
+    type: 1000base-tx
+  - name: eth6
+    type: 1000base-tx
+  - name: eth7
+    type: 1000base-tx
+  - name: eth8
+    type: 1000base-tx
+  - name: eth9
+    type: 1000base-tx
+  - name: eth10
+    type: 1000base-tx
+  - name: MGMT
+    type: 100base-tx
+    mgmt_only: true
diff --git a/device-types/Datacom/DM2104G2-EDD.yaml b/device-types/Datacom/DM2104G2-EDD.yaml
new file mode 100644
index 000000000..2c3fc89d1
--- /dev/null
+++ b/device-types/Datacom/DM2104G2-EDD.yaml
@@ -0,0 +1,37 @@
+---
+manufacturer: Datacom
+model: DM2104G2 EDD
+slug: datacom-dm2104g2-edd
+u_height: 1.0
+is_full_depth: true
+airflow: front-to-rear
+comments: Reference Datacom DM2104G2-EDD (https://datacom.com.br/uploads/product/file/d3cab58619e13eedda9def507a9a9b57.pdf)
+weight: 1.0
+weight_unit: kg
+console-ports:
+  - name: Console0
+    type: rj-45
+power-ports:
+  - name: Power Input AC/DC
+    type: iec-60320-c14
+    maximum_draw: 20
+interfaces:
+  - name: eth1
+    type: 1000base-x-sfp
+  - name: eth2
+    type: 1000base-x-sfp
+  - name: eth3
+    type: 1000base-x-sfp
+  - name: eth4
+    type: 1000base-x-sfp
+  - name: eth5
+    type: 1000base-tx
+  - name: eth6
+    type: 1000base-tx
+  - name: eth7
+    type: 1000base-tx
+  - name: eth8
+    type: 1000base-tx
+  - name: MGMT
+    type: 100base-tx
+    mgmt_only: true
diff --git a/device-types/Digi/portserver-ts-16.yaml b/device-types/Digi/portserver-ts-16.yaml
new file mode 100644
index 000000000..f3d4e5b75
--- /dev/null
+++ b/device-types/Digi/portserver-ts-16.yaml
@@ -0,0 +1,51 @@
+---
+manufacturer: Digi
+model: PortServer TS 16
+slug: digi-portserver-ts-16
+part_number: '70001743'
+u_height: 1
+is_full_depth: false
+weight: 3.2
+weight_unit: kg
+front_image: true
+comments: '[Digi PortServer TS 8/16 Support Page](https://hub.digi.com/support/products/infrastructure-management/portserver-ts-816mei/)'
+console-server-ports:
+  - name: Serial_1
+    type: rj-45
+  - name: Serial_2
+    type: rj-45
+  - name: Serial_3
+    type: rj-45
+  - name: Serial_4
+    type: rj-45
+  - name: Serial_5
+    type: rj-45
+  - name: Serial_6
+    type: rj-45
+  - name: Serial_7
+    type: rj-45
+  - name: Serial_8
+    type: rj-45
+  - name: Serial_9
+    type: rj-45
+  - name: Serial_10
+    type: rj-45
+  - name: Serial_11
+    type: rj-45
+  - name: Serial_12
+    type: rj-45
+  - name: Serial_13
+    type: rj-45
+  - name: Serial_14
+    type: rj-45
+  - name: Serial_15
+    type: rj-45
+  - name: Serial_16
+    type: rj-45
+power-ports:
+  - name: PSU
+    type: iec-60320-c14
+    maximum_draw: 12
+interfaces:
+  - name: Network
+    type: 100base-tx
diff --git a/device-types/Digi/portserver-ts-8.yaml b/device-types/Digi/portserver-ts-8.yaml
new file mode 100644
index 000000000..d430245da
--- /dev/null
+++ b/device-types/Digi/portserver-ts-8.yaml
@@ -0,0 +1,33 @@
+---
+manufacturer: Digi
+model: PortServer TS 8
+slug: digi-portserver-ts-8
+u_height: 1
+is_full_depth: false
+weight: 1.4
+weight_unit: kg
+comments: '[Digi PortServer TS 8/16 Support Page](https://hub.digi.com/support/products/infrastructure-management/portserver-ts-816mei/)'
+console-server-ports:
+  - name: Serial_1
+    type: rj-45
+  - name: Serial_2
+    type: rj-45
+  - name: Serial_3
+    type: rj-45
+  - name: Serial_4
+    type: rj-45
+  - name: Serial_5
+    type: rj-45
+  - name: Serial_6
+    type: rj-45
+  - name: Serial_7
+    type: rj-45
+  - name: Serial_8
+    type: rj-45
+power-ports:
+  - name: PSU (External)
+    type: iec-60320-c14
+    maximum_draw: 6
+interfaces:
+  - name: Network
+    type: 100base-tx
diff --git a/device-types/Extreme Networks/x590-24t-1q-2c.yaml b/device-types/Extreme Networks/X590-24t-1q-2c.yaml
similarity index 100%
rename from device-types/Extreme Networks/x590-24t-1q-2c.yaml
rename to device-types/Extreme Networks/X590-24t-1q-2c.yaml
diff --git a/device-types/Extreme Networks/X620-10x.yaml b/device-types/Extreme Networks/X620-10x.yaml
new file mode 100644
index 000000000..ecc6f5ba7
--- /dev/null
+++ b/device-types/Extreme Networks/X620-10x.yaml	
@@ -0,0 +1,48 @@
+---
+manufacturer: Extreme Networks
+model: X620-10x
+slug: extreme-networks-x620-10x
+part_number: '17404'
+u_height: 1
+is_full_depth: false
+front_image: true
+rear_image: true
+weight: 2.74
+weight_unit: kg
+comments: '[Extreme Networks X620 Technical Specifications](https://documentation.extremenetworks.com/extremeswitching/GUID-0C8FD510-0231-4278-9349-A8DC70AA88CD.shtml)'
+console-ports:
+  - name: Console
+    type: rj-45
+power-ports:
+  - name: C14
+    type: iec-60320-c14
+    maximum_draw: 36
+  - name: RPS1
+    type: dc-terminal
+    description: Redundant Power Supply
+interfaces:
+  - name: Mgmt-port
+    type: 1000base-t
+    mgmt_only: true
+  - name: '1'
+    type: 10gbase-x-sfpp
+  - name: '2'
+    type: 10gbase-x-sfpp
+  - name: '3'
+    type: 10gbase-x-sfpp
+  - name: '4'
+    type: 10gbase-x-sfpp
+  - name: '5'
+    type: 10gbase-x-sfpp
+  - name: '6'
+    type: 10gbase-x-sfpp
+  - name: '7'
+    type: 10gbase-x-sfpp
+  - name: '8'
+    type: 10gbase-x-sfpp
+  - name: '9'
+    type: 10gbase-x-sfpp
+    description: Can be used for stacking or as a standard port
+  - name: '10'
+    type: 10gbase-x-sfpp
+    description: Can be used for stacking or as a standard port
diff --git a/device-types/Extreme Networks/X620-16p.yaml b/device-types/Extreme Networks/X620-16p.yaml
new file mode 100644
index 000000000..e84de0afa
--- /dev/null
+++ b/device-types/Extreme Networks/X620-16p.yaml	
@@ -0,0 +1,104 @@
+---
+manufacturer: Extreme Networks
+model: X620-16p
+slug: extreme-networks-x620-16p
+part_number: '17403'
+u_height: 1
+is_full_depth: true
+front_image: true
+rear_image: true
+weight: 5.5
+weight_unit: kg
+comments: '[Extreme Networks X620 Technical Specifications](https://documentation.extremenetworks.com/extremeswitching/GUID-0C8FD510-0231-4278-9349-A8DC70AA88CD.shtml)'
+console-ports:
+  - name: Console
+    type: rj-45
+module-bays:
+  - name: PSU-1
+    position: PSU-1
+  - name: PSU-2
+    position: PSU-2
+interfaces:
+  - name: Mgmt-port
+    type: 1000base-t
+    mgmt_only: true
+  - name: '1'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+    description: Supports 2.5GBASE-T and 5GBASE-T as well
+  - name: '2'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+    description: Supports 2.5GBASE-T and 5GBASE-T as well
+  - name: '3'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+    description: Supports 2.5GBASE-T and 5GBASE-T as well
+  - name: '4'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+    description: Supports 2.5GBASE-T and 5GBASE-T as well
+  - name: '5'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+    description: Supports 2.5GBASE-T and 5GBASE-T as well
+  - name: '6'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+    description: Supports 2.5GBASE-T and 5GBASE-T as well
+  - name: '7'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+    description: Supports 2.5GBASE-T and 5GBASE-T as well
+  - name: '8'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+    description: Supports 2.5GBASE-T and 5GBASE-T as well
+  - name: '9'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+    description: Supports 2.5GBASE-T and 5GBASE-T as well
+  - name: '10'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+    description: Supports 2.5GBASE-T and 5GBASE-T as well
+  - name: '11'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+    description: Supports 2.5GBASE-T and 5GBASE-T as well
+  - name: '12'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+    description: Supports 2.5GBASE-T and 5GBASE-T as well
+  - name: '13'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+    description: Combo Port (either SFP+ or 10GBASE-T)
+  - name: '14'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+    description: Combo Port (either SFP+ or 10GBASE-T)
+  - name: '15'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+    description: Combo Port (either SFP+ or 10GBASE-T), SFP+ can be used for stacking or as a standard port
+  - name: '16'
+    type: 10gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+    description: Combo Port (either SFP+ or 10GBASE-T), SFP+ can be used for stacking or as a standard port
diff --git a/device-types/Extreme Networks/X620-16t.yaml b/device-types/Extreme Networks/X620-16t.yaml
new file mode 100644
index 000000000..158ba6458
--- /dev/null
+++ b/device-types/Extreme Networks/X620-16t.yaml	
@@ -0,0 +1,60 @@
+---
+manufacturer: Extreme Networks
+model: X620-16t
+slug: extreme-networks-x620-16t
+part_number: '17402'
+u_height: 1
+is_full_depth: true
+front_image: true
+rear_image: true
+weight: 5.52
+weight_unit: kg
+comments: '[Extreme Networks X620 Technical Specifications](https://documentation.extremenetworks.com/extremeswitching/GUID-0C8FD510-0231-4278-9349-A8DC70AA88CD.shtml)'
+console-ports:
+  - name: Console
+    type: rj-45
+module-bays:
+  - name: PSU-1
+    position: PSU-1
+  - name: PSU-2
+    position: PSU-2
+interfaces:
+  - name: Mgmt-port
+    type: 1000base-t
+    mgmt_only: true
+  - name: '1'
+    type: 10gbase-t
+  - name: '2'
+    type: 10gbase-t
+  - name: '3'
+    type: 10gbase-t
+  - name: '4'
+    type: 10gbase-t
+  - name: '5'
+    type: 10gbase-t
+  - name: '6'
+    type: 10gbase-t
+  - name: '7'
+    type: 10gbase-t
+  - name: '8'
+    type: 10gbase-t
+  - name: '9'
+    type: 10gbase-t
+  - name: '10'
+    type: 10gbase-t
+  - name: '11'
+    type: 10gbase-t
+  - name: '12'
+    type: 10gbase-t
+  - name: '13'
+    type: 10gbase-x-sfpp
+    description: Combo Port (either SFP+ or 10GBASE-T)
+  - name: '14'
+    type: 10gbase-x-sfpp
+    description: Combo Port (either SFP+ or 10GBASE-T)
+  - name: '15'
+    type: 10gbase-x-sfpp
+    description: Combo Port (either SFP+ or 10GBASE-T), SFP+ can be used for stacking or as a standard port
+  - name: '16'
+    type: 10gbase-x-sfpp
+    description: Combo Port (either SFP+ or 10GBASE-T), SFP+ can be used for stacking or as a standard port
diff --git a/device-types/Extreme Networks/X620-16x.yaml b/device-types/Extreme Networks/X620-16x.yaml
new file mode 100644
index 000000000..4f9ee9de4
--- /dev/null
+++ b/device-types/Extreme Networks/X620-16x.yaml	
@@ -0,0 +1,58 @@
+---
+manufacturer: Extreme Networks
+model: X620-16x
+slug: extreme-networks-x620-16x
+part_number: '17401'
+u_height: 1
+is_full_depth: true
+front_image: true
+rear_image: true
+weight: 5.10
+weight_unit: kg
+comments: '[Extreme Networks X620 Technical Specifications](https://documentation.extremenetworks.com/extremeswitching/GUID-0C8FD510-0231-4278-9349-A8DC70AA88CD.shtml)'
+console-ports:
+  - name: Console
+    type: rj-45
+module-bays:
+  - name: PSU-1
+    position: PSU-1
+  - name: PSU-2
+    position: PSU-2
+interfaces:
+  - name: Mgmt-port
+    type: 1000base-t
+    mgmt_only: true
+  - name: '1'
+    type: 10gbase-x-sfpp
+  - name: '2'
+    type: 10gbase-x-sfpp
+  - name: '3'
+    type: 10gbase-x-sfpp
+  - name: '4'
+    type: 10gbase-x-sfpp
+  - name: '5'
+    type: 10gbase-x-sfpp
+  - name: '6'
+    type: 10gbase-x-sfpp
+  - name: '7'
+    type: 10gbase-x-sfpp
+  - name: '8'
+    type: 10gbase-x-sfpp
+  - name: '9'
+    type: 10gbase-x-sfpp
+  - name: '10'
+    type: 10gbase-x-sfpp
+  - name: '11'
+    type: 10gbase-x-sfpp
+  - name: '12'
+    type: 10gbase-x-sfpp
+  - name: '13'
+    type: 10gbase-x-sfpp
+  - name: '14'
+    type: 10gbase-x-sfpp
+  - name: '15'
+    type: 10gbase-x-sfpp
+    description: Can be used for stacking or as a standard port
+  - name: '16'
+    type: 10gbase-x-sfpp
+    description: Can be used for stacking or as a standard port
diff --git a/device-types/Extreme Networks/X620-8t-2x.yaml b/device-types/Extreme Networks/X620-8t-2x.yaml
new file mode 100644
index 000000000..35f020261
--- /dev/null
+++ b/device-types/Extreme Networks/X620-8t-2x.yaml	
@@ -0,0 +1,48 @@
+---
+manufacturer: Extreme Networks
+model: X620-8t-2x
+slug: extreme-networks-x620-8t-2x
+part_number: '17405'
+u_height: 1
+is_full_depth: false
+front_image: true
+rear_image: true
+weight: 2.92
+weight_unit: kg
+comments: '[Extreme Networks X620 Technical Specifications](https://documentation.extremenetworks.com/extremeswitching/GUID-0C8FD510-0231-4278-9349-A8DC70AA88CD.shtml)'
+console-ports:
+  - name: Console
+    type: rj-45
+power-ports:
+  - name: C14
+    type: iec-60320-c14
+    maximum_draw: 52
+  - name: RPS1
+    type: dc-terminal
+    description: Redundant Power Supply
+interfaces:
+  - name: Mgmt-port
+    type: 1000base-t
+    mgmt_only: true
+  - name: '1'
+    type: 10gbase-t
+  - name: '2'
+    type: 10gbase-t
+  - name: '3'
+    type: 10gbase-t
+  - name: '4'
+    type: 10gbase-t
+  - name: '5'
+    type: 10gbase-t
+  - name: '6'
+    type: 10gbase-t
+  - name: '7'
+    type: 10gbase-t
+  - name: '8'
+    type: 10gbase-t
+  - name: '9'
+    type: 10gbase-x-sfpp
+    description: Can be used for stacking or as a standard port
+  - name: '10'
+    type: 10gbase-x-sfpp
+    description: Can be used for stacking or as a standard port
diff --git a/device-types/Juniper/EX4300-32F-DC-TAA.yaml b/device-types/Juniper/EX4300-32F-DC-TAA.yaml
index 17507b4e1..ae416b389 100644
--- a/device-types/Juniper/EX4300-32F-DC-TAA.yaml
+++ b/device-types/Juniper/EX4300-32F-DC-TAA.yaml
@@ -102,7 +102,3 @@ interfaces:
     type: 40gbase-x-qsfpp
   - name: et-0/1/1
     type: 40gbase-x-qsfpp
-  - name: et-0/1/2
-    type: 40gbase-x-qsfpp
-  - name: et-0/1/3
-    type: 40gbase-x-qsfpp
diff --git a/device-types/Juniper/EX4300-32F-DC.yaml b/device-types/Juniper/EX4300-32F-DC.yaml
index 406a8937d..bf5cb0728 100644
--- a/device-types/Juniper/EX4300-32F-DC.yaml
+++ b/device-types/Juniper/EX4300-32F-DC.yaml
@@ -102,7 +102,3 @@ interfaces:
     type: 40gbase-x-qsfpp
   - name: et-0/1/1
     type: 40gbase-x-qsfpp
-  - name: et-0/1/2
-    type: 40gbase-x-qsfpp
-  - name: et-0/1/3
-    type: 40gbase-x-qsfpp
diff --git a/device-types/Juniper/EX4300-32F-TAA.yaml b/device-types/Juniper/EX4300-32F-TAA.yaml
index c66abd9da..7a96521b3 100644
--- a/device-types/Juniper/EX4300-32F-TAA.yaml
+++ b/device-types/Juniper/EX4300-32F-TAA.yaml
@@ -102,7 +102,3 @@ interfaces:
     type: 40gbase-x-qsfpp
   - name: et-0/1/1
     type: 40gbase-x-qsfpp
-  - name: et-0/1/2
-    type: 40gbase-x-qsfpp
-  - name: et-0/1/3
-    type: 40gbase-x-qsfpp
diff --git a/device-types/Juniper/EX4300-32F.yaml b/device-types/Juniper/EX4300-32F.yaml
index 3de26e8e8..d35778adb 100644
--- a/device-types/Juniper/EX4300-32F.yaml
+++ b/device-types/Juniper/EX4300-32F.yaml
@@ -102,7 +102,3 @@ interfaces:
     type: 40gbase-x-qsfpp
   - name: et-0/1/1
     type: 40gbase-x-qsfpp
-  - name: et-0/1/2
-    type: 40gbase-x-qsfpp
-  - name: et-0/1/3
-    type: 40gbase-x-qsfpp
diff --git a/device-types/Meinberg/lantime-m300.yml b/device-types/Meinberg/lantime-m300.yml
new file mode 100644
index 000000000..62a0dc41e
--- /dev/null
+++ b/device-types/Meinberg/lantime-m300.yml
@@ -0,0 +1,32 @@
+---
+manufacturer: Meinberg
+model: Lantime M300
+slug: meinberg-lantime-m300
+description: NTP Server in 1U Case for Server Rackmount
+u_height: 1.0
+is_full_depth: false
+airflow: passive
+front_image: true
+rear_image: true
+comments: '[Product Page](https://www.meinbergglobal.com/english/archive/lantime-m300.htm)'
+weight: 3.5
+weight_unit: kg
+console-ports:
+  - name: serial
+    type: de-9
+    label: Terminal
+power-ports:
+  - name: PWR1
+    type: iec-60320-c14
+    maximum_draw: 20
+interfaces:
+  - name: lan0
+    type: 100base-tx
+    enabled: true
+    mgmt_only: false
+    label: LAN0
+  - name: lan1
+    type: 1000base-tx
+    enabled: true
+    mgmt_only: false
+    label: LAN1
diff --git a/device-types/Panduit/DP48688TGY.yaml b/device-types/Panduit/DP48688TGY.yaml
new file mode 100644
index 000000000..209824809
--- /dev/null
+++ b/device-types/Panduit/DP48688TGY.yaml
@@ -0,0 +1,347 @@
+---
+manufacturer: Panduit
+model: Cat 6 Punchdown Patch Panel, 48 Ports, 2 RU, Black
+slug: panduit-dp48688tgy
+part_number: DP48688TGY
+u_height: 2
+is_full_depth: false
+is_powered: false
+front_image: true
+front-ports:
+  - name: '01'
+    type: 8p8c
+    rear_port: '01'
+    rear_port_position: 1
+  - name: '02'
+    type: 8p8c
+    rear_port: '02'
+    rear_port_position: 1
+  - name: '03'
+    type: 8p8c
+    rear_port: '03'
+    rear_port_position: 1
+  - name: '04'
+    type: 8p8c
+    rear_port: '04'
+    rear_port_position: 1
+  - name: '05'
+    type: 8p8c
+    rear_port: '05'
+    rear_port_position: 1
+  - name: '06'
+    type: 8p8c
+    rear_port: '06'
+    rear_port_position: 1
+  - name: '07'
+    type: 8p8c
+    rear_port: '07'
+    rear_port_position: 1
+  - name: 08
+    type: 8p8c
+    rear_port: 08
+    rear_port_position: 1
+  - name: 09
+    type: 8p8c
+    rear_port: 09
+    rear_port_position: 1
+  - name: '10'
+    type: 8p8c
+    rear_port: '10'
+    rear_port_position: 1
+  - name: '11'
+    type: 8p8c
+    rear_port: '11'
+    rear_port_position: 1
+  - name: '12'
+    type: 8p8c
+    rear_port: '12'
+    rear_port_position: 1
+  - name: '13'
+    type: 8p8c
+    rear_port: '13'
+    rear_port_position: 1
+  - name: '14'
+    type: 8p8c
+    rear_port: '14'
+    rear_port_position: 1
+  - name: '15'
+    type: 8p8c
+    rear_port: '15'
+    rear_port_position: 1
+  - name: '16'
+    type: 8p8c
+    rear_port: '16'
+    rear_port_position: 1
+  - name: '17'
+    type: 8p8c
+    rear_port: '17'
+    rear_port_position: 1
+  - name: '18'
+    type: 8p8c
+    rear_port: '18'
+    rear_port_position: 1
+  - name: '19'
+    type: 8p8c
+    rear_port: '19'
+    rear_port_position: 1
+  - name: '20'
+    type: 8p8c
+    rear_port: '20'
+    rear_port_position: 1
+  - name: '21'
+    type: 8p8c
+    rear_port: '21'
+    rear_port_position: 1
+  - name: '22'
+    type: 8p8c
+    rear_port: '22'
+    rear_port_position: 1
+  - name: '23'
+    type: 8p8c
+    rear_port: '23'
+    rear_port_position: 1
+  - name: '24'
+    type: 8p8c
+    rear_port: '24'
+    rear_port_position: 1
+  - name: '25'
+    type: 8p8c
+    rear_port: '25'
+    rear_port_position: 1
+  - name: '26'
+    type: 8p8c
+    rear_port: '26'
+    rear_port_position: 1
+  - name: '27'
+    type: 8p8c
+    rear_port: '27'
+    rear_port_position: 1
+  - name: '28'
+    type: 8p8c
+    rear_port: '28'
+    rear_port_position: 1
+  - name: '29'
+    type: 8p8c
+    rear_port: '29'
+    rear_port_position: 1
+  - name: '30'
+    type: 8p8c
+    rear_port: '30'
+    rear_port_position: 1
+  - name: '31'
+    type: 8p8c
+    rear_port: '31'
+    rear_port_position: 1
+  - name: '32'
+    type: 8p8c
+    rear_port: '32'
+    rear_port_position: 1
+  - name: '33'
+    type: 8p8c
+    rear_port: '33'
+    rear_port_position: 1
+  - name: '34'
+    type: 8p8c
+    rear_port: '34'
+    rear_port_position: 1
+  - name: '35'
+    type: 8p8c
+    rear_port: '35'
+    rear_port_position: 1
+  - name: '36'
+    type: 8p8c
+    rear_port: '36'
+    rear_port_position: 1
+  - name: '37'
+    type: 8p8c
+    rear_port: '37'
+    rear_port_position: 1
+  - name: '38'
+    type: 8p8c
+    rear_port: '38'
+    rear_port_position: 1
+  - name: '39'
+    type: 8p8c
+    rear_port: '39'
+    rear_port_position: 1
+  - name: '40'
+    type: 8p8c
+    rear_port: '40'
+    rear_port_position: 1
+  - name: '41'
+    type: 8p8c
+    rear_port: '41'
+    rear_port_position: 1
+  - name: '42'
+    type: 8p8c
+    rear_port: '42'
+    rear_port_position: 1
+  - name: '43'
+    type: 8p8c
+    rear_port: '43'
+    rear_port_position: 1
+  - name: '44'
+    type: 8p8c
+    rear_port: '44'
+    rear_port_position: 1
+  - name: '45'
+    type: 8p8c
+    rear_port: '45'
+    rear_port_position: 1
+  - name: '46'
+    type: 8p8c
+    rear_port: '46'
+    rear_port_position: 1
+  - name: '47'
+    type: 8p8c
+    rear_port: '47'
+    rear_port_position: 1
+  - name: '48'
+    type: 8p8c
+    rear_port: '48'
+    rear_port_position: 1
+rear-ports:
+  - name: '01'
+    type: 110-punch
+    positions: 1
+  - name: '02'
+    type: 110-punch
+    positions: 1
+  - name: '03'
+    type: 110-punch
+    positions: 1
+  - name: '04'
+    type: 110-punch
+    positions: 1
+  - name: '05'
+    type: 110-punch
+    positions: 1
+  - name: '06'
+    type: 110-punch
+    positions: 1
+  - name: '07'
+    type: 110-punch
+    positions: 1
+  - name: '08'
+    type: 110-punch
+    positions: 1
+  - name: '09'
+    type: 110-punch
+    positions: 1
+  - name: '10'
+    type: 110-punch
+    positions: 1
+  - name: '11'
+    type: 110-punch
+    positions: 1
+  - name: '12'
+    type: 110-punch
+    positions: 1
+  - name: '13'
+    type: 110-punch
+    positions: 1
+  - name: '14'
+    type: 110-punch
+    positions: 1
+  - name: '15'
+    type: 110-punch
+    positions: 1
+  - name: '16'
+    type: 110-punch
+    positions: 1
+  - name: '17'
+    type: 110-punch
+    positions: 1
+  - name: '18'
+    type: 110-punch
+    positions: 1
+  - name: '19'
+    type: 110-punch
+    positions: 1
+  - name: '20'
+    type: 110-punch
+    positions: 1
+  - name: '21'
+    type: 110-punch
+    positions: 1
+  - name: '22'
+    type: 110-punch
+    positions: 1
+  - name: '23'
+    type: 110-punch
+    positions: 1
+  - name: '24'
+    type: 110-punch
+    positions: 1
+  - name: '25'
+    type: 110-punch
+    positions: 1
+  - name: '26'
+    type: 110-punch
+    positions: 1
+  - name: '27'
+    type: 110-punch
+    positions: 1
+  - name: '28'
+    type: 110-punch
+    positions: 1
+  - name: '29'
+    type: 110-punch
+    positions: 1
+  - name: '30'
+    type: 110-punch
+    positions: 1
+  - name: '31'
+    type: 110-punch
+    positions: 1
+  - name: '32'
+    type: 110-punch
+    positions: 1
+  - name: '33'
+    type: 110-punch
+    positions: 1
+  - name: '34'
+    type: 110-punch
+    positions: 1
+  - name: '35'
+    type: 110-punch
+    positions: 1
+  - name: '36'
+    type: 110-punch
+    positions: 1
+  - name: '37'
+    type: 110-punch
+    positions: 1
+  - name: '38'
+    type: 110-punch
+    positions: 1
+  - name: '39'
+    type: 110-punch
+    positions: 1
+  - name: '40'
+    type: 110-punch
+    positions: 1
+  - name: '41'
+    type: 110-punch
+    positions: 1
+  - name: '42'
+    type: 110-punch
+    positions: 1
+  - name: '43'
+    type: 110-punch
+    positions: 1
+  - name: '44'
+    type: 110-punch
+    positions: 1
+  - name: '45'
+    type: 110-punch
+    positions: 1
+  - name: '46'
+    type: 110-punch
+    positions: 1
+  - name: '47'
+    type: 110-punch
+    positions: 1
+  - name: '48'
+    type: 110-punch
+    positions: 1
diff --git a/device-types/Supermicro/AS-3015MR-H8TNR.yaml b/device-types/Supermicro/AS-3015MR-H8TNR.yaml
new file mode 100644
index 000000000..39c41784f
--- /dev/null
+++ b/device-types/Supermicro/AS-3015MR-H8TNR.yaml
@@ -0,0 +1,45 @@
+---
+manufacturer: Supermicro
+model: MicroCloud A+ Server AS 3015MR-H8TNR
+slug: supermicro-as-3015mr-h8tnr
+part_number: AS-3015MR-H8TNR
+u_height: 3
+is_full_depth: true
+airflow: front-to-rear
+comments: '[MicroCloud A+ Server AS 3015MR-H8TNR](https://www.supermicro.com/en/products/system/microcloud/3u/as%20-3015mr-h8tnr)'
+subdevice_role: parent
+weight: 28.21
+weight_unit: kg
+interfaces:
+  - name: IPMI 1
+    type: 1000base-t
+    mgmt_only: true
+    description: Redundant IPMI port
+  - name: IPMI 2
+    type: 1000base-t
+    mgmt_only: true
+    description: Redundant IPMI port
+module-bays:
+  - name: PSU0
+    position: PSU 0
+    maximum_draw: 2200
+  - name: PSU1
+    position: PSU 1
+    maximum_draw: 2200
+device-bays:
+  - name: Node 1
+    label: Compute Node 1
+  - name: Node 2
+    label: Compute Node 2
+  - name: Node 3
+    label: Compute Node 3
+  - name: Node 4
+    label: Compute Node 4
+  - name: Node 5
+    label: Compute Node 5
+  - name: Node 6
+    label: Compute Node 6
+  - name: Node 7
+    label: Compute Node 7
+  - name: Node 8
+    label: Compute Node 8
diff --git a/device-types/Synology/RS3621xs+.yaml b/device-types/Synology/RS3621xs+.yaml
index 2fe48232c..ab9d0a855 100644
--- a/device-types/Synology/RS3621xs+.yaml
+++ b/device-types/Synology/RS3621xs+.yaml
@@ -18,6 +18,10 @@ module-bays:
   - name: PSU-2
     label: '2'
     position: PSU-2
+  - name: PCIe Slot 1
+    position: '1'
+  - name: PCIe Slot 2
+    position: '2'
 interfaces:
   - name: LAN1
     type: 1000base-t
diff --git a/elevation-images/Digi/digi-portserver-ts-16.front.jpg b/elevation-images/Digi/digi-portserver-ts-16.front.jpg
new file mode 100644
index 000000000..272f898be
Binary files /dev/null and b/elevation-images/Digi/digi-portserver-ts-16.front.jpg differ
diff --git a/elevation-images/Extreme Networks/extreme-networks-x620-10x.front.png b/elevation-images/Extreme Networks/extreme-networks-x620-10x.front.png
new file mode 100644
index 000000000..741a6e89d
Binary files /dev/null and b/elevation-images/Extreme Networks/extreme-networks-x620-10x.front.png differ
diff --git a/elevation-images/Extreme Networks/extreme-networks-x620-10x.rear.png b/elevation-images/Extreme Networks/extreme-networks-x620-10x.rear.png
new file mode 100644
index 000000000..c60050760
Binary files /dev/null and b/elevation-images/Extreme Networks/extreme-networks-x620-10x.rear.png differ
diff --git a/elevation-images/Extreme Networks/extreme-networks-x620-16p.front.png b/elevation-images/Extreme Networks/extreme-networks-x620-16p.front.png
new file mode 100644
index 000000000..c60c7aafb
Binary files /dev/null and b/elevation-images/Extreme Networks/extreme-networks-x620-16p.front.png differ
diff --git a/elevation-images/Extreme Networks/extreme-networks-x620-16p.rear.png b/elevation-images/Extreme Networks/extreme-networks-x620-16p.rear.png
new file mode 100644
index 000000000..1f597ac34
Binary files /dev/null and b/elevation-images/Extreme Networks/extreme-networks-x620-16p.rear.png differ
diff --git a/elevation-images/Extreme Networks/extreme-networks-x620-16t.front.png b/elevation-images/Extreme Networks/extreme-networks-x620-16t.front.png
new file mode 100644
index 000000000..5108b7f1c
Binary files /dev/null and b/elevation-images/Extreme Networks/extreme-networks-x620-16t.front.png differ
diff --git a/elevation-images/Extreme Networks/extreme-networks-x620-16t.rear.png b/elevation-images/Extreme Networks/extreme-networks-x620-16t.rear.png
new file mode 100644
index 000000000..c19abbce9
Binary files /dev/null and b/elevation-images/Extreme Networks/extreme-networks-x620-16t.rear.png differ
diff --git a/elevation-images/Extreme Networks/extreme-networks-x620-16x.front.png b/elevation-images/Extreme Networks/extreme-networks-x620-16x.front.png
new file mode 100644
index 000000000..815636251
Binary files /dev/null and b/elevation-images/Extreme Networks/extreme-networks-x620-16x.front.png differ
diff --git a/elevation-images/Extreme Networks/extreme-networks-x620-16x.rear.png b/elevation-images/Extreme Networks/extreme-networks-x620-16x.rear.png
new file mode 100644
index 000000000..a1d86e964
Binary files /dev/null and b/elevation-images/Extreme Networks/extreme-networks-x620-16x.rear.png differ
diff --git a/elevation-images/Extreme Networks/extreme-networks-x620-8t-2x.front.png b/elevation-images/Extreme Networks/extreme-networks-x620-8t-2x.front.png
new file mode 100644
index 000000000..d6b236443
Binary files /dev/null and b/elevation-images/Extreme Networks/extreme-networks-x620-8t-2x.front.png differ
diff --git a/elevation-images/Extreme Networks/extreme-networks-x620-8t-2x.rear.png b/elevation-images/Extreme Networks/extreme-networks-x620-8t-2x.rear.png
new file mode 100644
index 000000000..9c790b452
Binary files /dev/null and b/elevation-images/Extreme Networks/extreme-networks-x620-8t-2x.rear.png differ
diff --git a/elevation-images/Meinberg/meinberg-lantime-m300.front.png b/elevation-images/Meinberg/meinberg-lantime-m300.front.png
new file mode 100644
index 000000000..51d586ba3
Binary files /dev/null and b/elevation-images/Meinberg/meinberg-lantime-m300.front.png differ
diff --git a/elevation-images/Meinberg/meinberg-lantime-m300.rear.png b/elevation-images/Meinberg/meinberg-lantime-m300.rear.png
new file mode 100644
index 000000000..7af84b798
Binary files /dev/null and b/elevation-images/Meinberg/meinberg-lantime-m300.rear.png differ
diff --git a/module-types/Cisco/NXA-PAC-1200W-PI.yaml b/module-types/Cisco/NXA-PAC-1200W-PI.yaml
new file mode 100644
index 000000000..430b3967b
--- /dev/null
+++ b/module-types/Cisco/NXA-PAC-1200W-PI.yaml
@@ -0,0 +1,12 @@
+---
+manufacturer: Cisco
+model: NXA-PAC-1200W-PI
+part_number: NXA-PAC-1200W-PI
+description: Nexus AC 1200W PSU - Port Side Intake
+comments: Nexus AC 1200W PSU - Port Side Intake / [Cisco Nexus 9300-FX2 Series Switches Data Sheet](https://www.cisco.com/c/en/us/products/collateral/switches/nexus-9000-series-switches/datasheet-c78-742282.html)
+weight: 1.1
+weight_unit: kg
+power-ports:
+  - name: PSU{module}
+    type: iec-60320-c14
+    maximum_draw: 1100
diff --git a/module-types/Extreme Networks/Summit-300W-AC-BF.yaml b/module-types/Extreme Networks/Summit-300W-AC-BF.yaml
new file mode 100644
index 000000000..433083181
--- /dev/null
+++ b/module-types/Extreme Networks/Summit-300W-AC-BF.yaml	
@@ -0,0 +1,11 @@
+---
+manufacturer: Extreme Networks
+model: Summit-300W-AC-BF
+part_number: '10943'
+comments: 300W AC power supply for some X460-G2 and X620 models, back to front airflow
+weight: 1000
+weight_unit: g
+power-ports:
+  - name: PSU{module}
+    type: iec-60320-c14
+    maximum_draw: 300
diff --git a/module-types/Extreme Networks/Summit-300W-AC-FB.yaml b/module-types/Extreme Networks/Summit-300W-AC-FB.yaml
new file mode 100644
index 000000000..66e501c77
--- /dev/null
+++ b/module-types/Extreme Networks/Summit-300W-AC-FB.yaml	
@@ -0,0 +1,11 @@
+---
+manufacturer: Extreme Networks
+model: Summit-300W-AC-FB
+part_number: 10930A
+comments: 300W AC power supply for some X460-G2 and X620 models, front to back airflow
+weight: 1000
+weight_unit: g
+power-ports:
+  - name: PSU{module}
+    type: iec-60320-c14
+    maximum_draw: 300
diff --git a/module-types/Extreme Networks/Summit-300W-DC-BF.yaml b/module-types/Extreme Networks/Summit-300W-DC-BF.yaml
new file mode 100644
index 000000000..80f30ae9b
--- /dev/null
+++ b/module-types/Extreme Networks/Summit-300W-DC-BF.yaml	
@@ -0,0 +1,11 @@
+---
+manufacturer: Extreme Networks
+model: Summit-300W-DC-BF
+part_number: '10944'
+comments: 300W DC power supply for some X460-G2 and X620 models, back to front airflow
+weight: 830
+weight_unit: g
+power-ports:
+  - name: PSU{module}
+    type: dc-terminal
+    maximum_draw: 300
diff --git a/module-types/Extreme Networks/Summit-300W-DC-FB.yaml b/module-types/Extreme Networks/Summit-300W-DC-FB.yaml
new file mode 100644
index 000000000..1a3c8e638
--- /dev/null
+++ b/module-types/Extreme Networks/Summit-300W-DC-FB.yaml	
@@ -0,0 +1,11 @@
+---
+manufacturer: Extreme Networks
+model: Summit-300W-DC-FB
+part_number: '10933'
+comments: 300W DC power supply for some X460-G2 and X620 models, front to back airflow
+weight: 830
+weight_unit: g
+power-ports:
+  - name: PSU{module}
+    type: dc-terminal
+    maximum_draw: 300
diff --git a/module-types/Extreme Networks/Summit-750W-AC-FB.yaml b/module-types/Extreme Networks/Summit-750W-AC-FB.yaml
new file mode 100644
index 000000000..630495f4f
--- /dev/null
+++ b/module-types/Extreme Networks/Summit-750W-AC-FB.yaml	
@@ -0,0 +1,11 @@
+---
+manufacturer: Extreme Networks
+model: Summit-750W-AC-FB
+part_number: '10931'
+comments: 750W AC power supply for some X460 and X620 switch models and EPS-C2 external power supply system, front to back airflow
+weight: 1.0
+weight_unit: kg
+power-ports:
+  - name: PSU{module}
+    type: iec-60320-c14
+    maximum_draw: 750
diff --git a/module-types/HPE/720478-B21.yaml b/module-types/HPE/720478-B21.yaml
new file mode 100644
index 000000000..2c79d699f
--- /dev/null
+++ b/module-types/HPE/720478-B21.yaml
@@ -0,0 +1,11 @@
+---
+manufacturer: HPE
+model: 720478-B21
+part_number: 720478-B21
+description: 500W Flex Slot Power Supply Kit for ProLiant G9
+weight: 1
+weight_unit: kg
+power-ports:
+  - name: '{module}'
+    type: iec-60320-c14
+    maximum_draw: 500
diff --git a/module-types/HPE/P42044-B21.yaml b/module-types/HPE/P42044-B21.yaml
new file mode 100644
index 000000000..e0d01a35f
--- /dev/null
+++ b/module-types/HPE/P42044-B21.yaml
@@ -0,0 +1,12 @@
+---
+manufacturer: HPE
+model: P42044-B21
+part_number: P42044-B21
+description: Mellanox MCX631102AS-ADAT Ethernet 10/25Gb 2-port SFP28 Adapter for HPE
+interfaces:
+  - name: Ethernet/{module}/1
+    type: 25gbase-x-sfp28
+    mgmt_only: false
+  - name: Ethernet/{module}/2
+    type: 25gbase-x-sfp28
+    mgmt_only: false
diff --git a/module-types/Juniper/EX-UM-8X8SFP.yaml b/module-types/Juniper/EX-UM-8X8SFP.yaml
new file mode 100644
index 000000000..9f5db1e61
--- /dev/null
+++ b/module-types/Juniper/EX-UM-8X8SFP.yaml
@@ -0,0 +1,21 @@
+---
+manufacturer: Juniper
+model: EX-UM-8X8SFP
+part_number: EX-UM-8X8SFP
+interfaces:
+  - name: ge-0/2/0
+    type: 10gbase-x-sfpp
+  - name: ge-0/2/1
+    type: 10gbase-x-sfpp
+  - name: ge-0/2/2
+    type: 10gbase-x-sfpp
+  - name: ge-0/2/3
+    type: 10gbase-x-sfpp
+  - name: xe-0/2/4
+    type: 10gbase-x-sfpp
+  - name: xe-0/2/5
+    type: 10gbase-x-sfpp
+  - name: xe-0/2/6
+    type: 10gbase-x-sfpp
+  - name: xe-0/2/7
+    type: 10gbase-x-sfpp
diff --git a/module-types/Supermicro/AOC-C25G-m1S.yaml b/module-types/Supermicro/AOC-C25G-m1S.yaml
new file mode 100644
index 000000000..cb8993667
--- /dev/null
+++ b/module-types/Supermicro/AOC-C25G-m1S.yaml
@@ -0,0 +1,10 @@
+---
+manufacturer: Supermicro
+model: Add-on Card AOC-C25G-m1S
+part_number: AOC-C25G-m1S
+description: Mellanox ConnectX-4 Lx EN controller - Advanced I/O Module (AIOM) Form Factor
+comments: '[AOC-C25G-m1S Product Sheet](https://www.supermicro.com/en/products/accessories/addon/AOC-C25G-m1S.php)'
+interfaces:
+  - name: Ethernet/{module}/1
+    type: 25gbase-x-sfp28
+    mgmt_only: false
diff --git a/module-types/Supermicro/AOC-MCX4121A-ACAT.yaml b/module-types/Supermicro/AOC-MCX4121A-ACAT.yaml
new file mode 100644
index 000000000..4fe3d1d46
--- /dev/null
+++ b/module-types/Supermicro/AOC-MCX4121A-ACAT.yaml
@@ -0,0 +1,12 @@
+---
+manufacturer: Supermicro
+model: Add-on Card AOC-MCX4121A-ACAT
+part_number: AOC-MCX4121A-ACAT
+description: Mellanox® ConnectX-4 Lx EN
+interfaces:
+  - name: Ethernet/{module}/1
+    type: 25gbase-x-sfp28
+    mgmt_only: false
+  - name: Ethernet/{module}/2
+    type: 25gbase-x-sfp28
+    mgmt_only: false
diff --git a/module-types/Supermicro/AOC-S25GC-i2S.yaml b/module-types/Supermicro/AOC-S25GC-i2S.yaml
new file mode 100644
index 000000000..d60527e7c
--- /dev/null
+++ b/module-types/Supermicro/AOC-S25GC-i2S.yaml
@@ -0,0 +1,13 @@
+---
+manufacturer: Supermicro
+model: Add-on Card AOC-S25GC-i2S
+part_number: AOC-S25GC-i2S
+description: Intel E810-XXVAM2 Ethernet Controller - Advanced I/O Module (AIOM) Form Factor
+comments: '[AOC-S25GC-i2S Product Sheet](https://www.supermicro.com/en/products/accessories/addon/AOC-S25GC-i2S.php)'
+interfaces:
+  - name: Ethernet/{module}/1
+    type: 25gbase-x-sfp28
+    mgmt_only: false
+  - name: Ethernet/{module}/2
+    type: 25gbase-x-sfp28
+    mgmt_only: false
diff --git a/module-types/Supermicro/PWS-2K20A-1R.yml b/module-types/Supermicro/PWS-2K20A-1R.yml
new file mode 100644
index 000000000..50c480ede
--- /dev/null
+++ b/module-types/Supermicro/PWS-2K20A-1R.yml
@@ -0,0 +1,9 @@
+---
+manufacturer: Supermicro
+model: PWS-2K20A-1R
+part_number: PWS-2K20A-1R
+comments: '[2200W 1U Redundant Power Supply](https://store.supermicro.com/us_en/pub/media/wysiwyg/productspecs/PWS-2K20A-1R/PWS-2K20A-1R_datasheet_Spec_11092018.pdf)'
+power-ports:
+  - name: PSU{module}
+    type: iec-60320-c14
+    maximum_draw: 2200
diff --git a/module-types/Synology/E25G30-F2.yaml b/module-types/Synology/E25G30-F2.yaml
new file mode 100644
index 000000000..099b938da
--- /dev/null
+++ b/module-types/Synology/E25G30-F2.yaml
@@ -0,0 +1,11 @@
+---
+manufacturer: Synology
+model: E25G30-F2
+part_number: E25G30-F2
+description: Dual-port 25GbE SFP28 PCIe 3.0 x8 Network adapter
+comments: '[E25G30-F2 Specs](https://www.synology.com/en-us/products/E25G30-F2#specs)'
+interfaces:
+  - name: '{module}/LAN 1'
+    type: 25gbase-x-sfp28
+  - name: '{module}/LAN 2'
+    type: 25gbase-x-sfp28
diff --git a/module-types/Synology/PSU 500W-RP Module_2.yml b/module-types/Synology/PSU 500W-RP Module_2.yml
new file mode 100644
index 000000000..00c442971
--- /dev/null
+++ b/module-types/Synology/PSU 500W-RP Module_2.yml	
@@ -0,0 +1,15 @@
+---
+manufacturer: Synology
+model: PSU 500W-RP Module_2
+part_number: PSU 500W-RP Module_2
+description: Redundant Power Module 500W
+weight: 0.77
+weight_unit: kg
+comments: |
+  [PSU 500W-RP Redundant Power Module 500W](https://www.synology.com/de-de/products/spare_parts?search_by=category&category=PSU)
+
+  for FS3410, SA6400, SA3610, SA3410, RS4021xs+, RS3621xs+, RS3621RPxs, RS2821RP+, RX1223RP.
+power-ports:
+  - name: '{module}'
+    type: iec-60320-c14
+    maximum_draw: 500
diff --git a/module-types/Synology/PSU 550W-RP Module_1.yml b/module-types/Synology/PSU 550W-RP Module_1.yml
new file mode 100644
index 000000000..d5b658a20
--- /dev/null
+++ b/module-types/Synology/PSU 550W-RP Module_1.yml	
@@ -0,0 +1,15 @@
+---
+manufacturer: Synology
+model: PSU 550W-RP Module_1
+part_number: PSU 550W-RP Module_1
+description: Redundant Power Module 550W
+weight: 0.82
+weight_unit: kg
+comments: |
+  [PSU 550W-RP Redundant Power Module 550W](https://www.synology.com/de-de/products/spare_parts?search_by=category&category=PSU)
+
+  for FS3410, SA6400, SA3610, SA3410, RS4021xs+, RS3621xs+, RS3621RPxs, RS2821RP+, RX1223RP.
+power-ports:
+  - name: '{module}'
+    type: iec-60320-c14
+    maximum_draw: 550
diff --git a/tests/definitions_test.py b/tests/definitions_test.py
index 52dbef205..ebd81783c 100644
--- a/tests/definitions_test.py
+++ b/tests/definitions_test.py
@@ -159,6 +159,14 @@ 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:
+        pytest.fail(
+            f"{file_path} contains non-ASCII characters: {', '.join(set(non_ascii_chars))}",
+            pytrace=False
+        )
 
     # Validate YAML definition against the supplied schema
     try:
diff --git a/tests/known-modules.pickle b/tests/known-modules.pickle
index 86a589914..036090f19 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 389f2a49b..d21331cb0 100644
Binary files a/tests/known-slugs.pickle and b/tests/known-slugs.pickle differ