diff --git a/device-types/Dell/PowerEdge-R630.yaml b/device-types/Dell/PowerEdge-R630.yaml
index b0b91bd4c..0fe587dff 100644
--- a/device-types/Dell/PowerEdge-R630.yaml
+++ b/device-types/Dell/PowerEdge-R630.yaml
@@ -9,20 +9,22 @@ console-ports:
     type: de-9
   - name: VGA
     type: other
-power-ports:
-  - name: Power 1
-    type: iec-60320-c14
-  - name: Power 2
-    type: iec-60320-c14
 interfaces:
-  - name: Gig-E 1
-    type: 1000base-t
-  - name: Gig-E 2
-    type: 1000base-t
-  - name: Gig-E 3
-    type: 1000base-t
-  - name: Gig-E 4
-    type: 1000base-t
   - name: iDRAC
     type: 1000base-t
     mgmt_only: true
+module-bays:
+  - name: PSU-1
+    label: '1'
+    position: PSU-1
+  - name: PSU-2
+    label: '2'
+    position: PSU-2
+  - name: Network Daughter Card slot 1
+    position: NDC-1
+  - name: Riser PCIe-Gen3 1
+    position: PCIe-Gen3-1
+  - name: Riser PCIe-Gen3 2
+    position: PCIe-Gen3-2
+  - name: Riser PCIe-Gen3 3
+    position: PCIe-Gen3-3
diff --git a/device-types/Dell/PowerEdge-R730xd.yaml b/device-types/Dell/PowerEdge-R730xd.yaml
index 66a54d1be..5e0e60d66 100644
--- a/device-types/Dell/PowerEdge-R730xd.yaml
+++ b/device-types/Dell/PowerEdge-R730xd.yaml
@@ -4,20 +4,35 @@ model: PowerEdge R730xd
 slug: dell-poweredge-r730xd
 u_height: 2
 is_full_depth: true
-power-ports:
-  - name: Power 1
-    type: iec-60320-c14
-  - name: Power 2
-    type: iec-60320-c14
+comments: '[Technical Guide](https://i.dell.com/sites/doccontent/shared-content/data-sheets/en/Documents/Dell-PowerEdge-R730-and-R730xd-Technical-Guide-v1-7.pdf)'
+module-bays:
+  - name: PSU-1
+    label: '1'
+    position: PSU-1
+  - name: PSU-2
+    label: '2'
+    position: PSU-2
+  - name: Network Daughter Card slot 1
+    position: NDC-1
+  - name: PCIe slot 1
+    position: PCIe-1
+    label: '1'
+  - name: Riser PCIe slot 2
+    position: PCIe-2
+    label: '2'
+  - name: Riser PCIe slot 3
+    position: PCIe-3
+    label: '3'
+  - name: PCIe slot 4
+    position: PCIe-4
+    label: '4'
+  - name: Riser PCIe slot 5
+    position: PCIe-5
+    label: '5'
+  - name: Riser PCIe slot 6
+    position: PCIe-6
+    label: '6'
 interfaces:
-  - name: Gig-E 1
-    type: 1000base-t
-  - name: Gig-E 2
-    type: 1000base-t
-  - name: Gig-E 3
-    type: 1000base-t
-  - name: Gig-E 4
-    type: 1000base-t
   - name: iDRAC
     type: 1000base-t
     mgmt_only: true
diff --git a/device-types/Dell/PowerEdge-R740.yaml b/device-types/Dell/PowerEdge-R740.yaml
index 277f19a6f..ced1d906f 100644
--- a/device-types/Dell/PowerEdge-R740.yaml
+++ b/device-types/Dell/PowerEdge-R740.yaml
@@ -4,7 +4,7 @@ model: PowerEdge R740
 slug: dell-poweredge-r740
 u_height: 2
 is_full_depth: true
-subdevice_role: parent
+comments: '[Technical Guide](https://i.dell.com/sites/csdocuments/Shared-Content_data-Sheets_Documents/en/aa/PowerEdge_R740_R740xd_Technical_Guide.pdf)'
 console-ports:
   - name: Rear Serial
     type: de-9
@@ -12,31 +12,40 @@ console-ports:
     type: other
   - name: Rear VGA
     type: other
-power-ports:
-  - name: Power 1
-    type: iec-60320-c14
-    maximum_draw: 750
-  - name: Power 2
-    type: iec-60320-c14
-    maximum_draw: 750
 interfaces:
-  - name: Gig-E 1
-    type: 1000base-t
-  - name: Gig-E 2
-    type: 1000base-t
-  - name: Gig-E 3
-    type: 1000base-t
-  - name: Gig-E 4
-    type: 1000base-t
   - name: iDRAC9
     type: 1000base-t
     mgmt_only: true
-device-bays:
-  - name: PCIe-Gen3 1
-  - name: PCIe-Gen3 2
-  - name: PCIe-Gen3 3
-  - name: Riser2 PCIe-Gen3 4
-  - name: Riser2 PCIe-Gen3 5
-  - name: Riser2 PCIe-Gen3 6
-  - name: Riser3 PCIe-Gen3 7
-  - name: Riser3 PCIe-Gen3 8
+module-bays:
+  - name: PSU-1
+    label: '1'
+    position: PSU-1
+  - name: PSU-2
+    label: '2'
+    position: PSU-2
+  - name: NUMA 0 - NDC slot 1
+    position: NDC-1
+  - name: NUMA 0 - PCIe slot 1 - FH
+    position: PCIe-1
+    label: '1'
+  - name: NUMA 0 - PCIe slot 2 - FH
+    position: PCIe-2
+    label: '2'
+  - name: NUMA 0 - PCIe slot 3 - FH
+    position: PCIe-3
+    label: '3'
+  - name: NUMA 1 - PCIe slot 4 - FH
+    position: PCIe-4
+    label: '4'
+  - name: NUMA 1 - PCIe slot 5 - FH
+    position: PCIe-5
+    label: '5'
+  - name: NUMA 0 - PCIe slot 6 - LP
+    position: PCIe-6
+    label: '6'
+  - name: NUMA 1 - PCIe slot 7 - FH
+    position: PCIe-7
+    label: '7'
+  - name: NUMA 1 - PCIe slot 8 - FH
+    position: PCIe-8
+    label: '8'
diff --git a/device-types/Dell/PowerEdge-R750.yml b/device-types/Dell/PowerEdge-R750.yml
index aa59db962..3000d928d 100644
--- a/device-types/Dell/PowerEdge-R750.yml
+++ b/device-types/Dell/PowerEdge-R750.yml
@@ -4,7 +4,7 @@ model: PowerEdge R750
 slug: dell-poweredge-r750
 u_height: 2
 is_full_depth: true
-subdevice_role: parent
+comments: '[Technical Guide](https://i.dell.com/sites/csdocuments/Product_Docs/en/poweredge-r750-technical-guide.pdf)'
 console-ports:
   - name: Rear Serial
     type: de-9
@@ -12,34 +12,41 @@ console-ports:
     type: other
   - name: Rear VGA
     type: other
-power-ports:
-  - name: Power 1
-    type: iec-60320-c14
-    maximum_draw: 800
-  - name: Power 2
-    type: iec-60320-c14
-    maximum_draw: 800
 interfaces:
-  - name: Gig-E 1
-    type: 1000base-t
-  - name: Gig-E 2
-    type: 1000base-t
-  - name: Gig-E 3
-    type: 1000base-t
-  - name: Gig-E 4
-    type: 1000base-t
   - name: iDRAC9 1
+    label: iDRAC
     type: 1000base-t
     mgmt_only: true
-  - name: iDRAC9 2
-    type: 1000base-t
-    mgmt_only: true
-device-bays:
-  - name: Riser PCIe-Gen3 1
-  - name: Riser PCIe-Gen3 2
-  - name: Riser PCIe-Gen3 3
-  - name: Riser PCIe-Gen3 4
-  - name: Riser PCIe-Gen3 5
-  - name: Riser PCIe-Gen3 6
-  - name: Riser PCIe-Gen3 7
-  - name: Riser PCIe-Gen3 8
+module-bays:
+  - name: PSU-1
+    label: '1'
+    position: PSU-1
+  - name: PSU-2
+    label: '2'
+    position: PSU-2
+  - name: NUMA 0 - OCP slot 1
+    position: OCP-1
+  - name: NUMA 0 - PCIe slot 1 - FH
+    position: PCIe-1
+    label: '1'
+  - name: NUMA 0 - PCIe slot 2 - FH
+    position: PCIe-2
+    label: '2'
+  - name: NUMA 0 - PCIe slot 3 - LP
+    position: PCIe-3
+    label: '3'
+  - name: NUMA 0 - PCIe slot 4 - FH
+    position: PCIe-4
+    label: '4'
+  - name: NUMA 1 - PCIe slot 5 - FH
+    position: PCIe-5
+    label: '5'
+  - name: NUMA 1 - PCIe slot 6 - LP
+    position: PCIe-6
+    label: '6'
+  - name: NUMA 1 - PCIe slot 7 - FH
+    position: PCIe-7
+    label: '7'
+  - name: NUMA 1 - PCIe slot 8 - FH
+    position: PCIe-8
+    label: '8'
diff --git a/device-types/Juniper/QFX5210-64C.yaml b/device-types/Juniper/QFX5210-64C.yaml
index 0bfe7484b..5644ded99 100644
--- a/device-types/Juniper/QFX5210-64C.yaml
+++ b/device-types/Juniper/QFX5210-64C.yaml
@@ -2,8 +2,9 @@
 manufacturer: Juniper
 model: QFX5210-64C
 slug: juniper-qfx5210-64c
-comments: '[Juniper QFX5200 Data Sheet](https://www.juniper.net/us/en/products-services/switching/qfx-series/qfx5200/)'
-u_height: 1
+comments: '[Juniper QFX5210 Data Sheet](https://www.juniper.net/content/dam/www/assets/datasheets/us/en/switches/qfx5210-switch-datasheet.pdf)\n[Hardware
+  Guide](https://www.juniper.net/documentation/us/en/hardware/qfx5210/index.html)'
+u_height: 2
 interfaces:
   - name: fxp0
     type: 1000base-t
diff --git a/device-types/Pluribus/Freedom-E28Q-L.yaml b/device-types/Pluribus/Freedom-E28Q-L.yaml
new file mode 100644
index 000000000..19898d949
--- /dev/null
+++ b/device-types/Pluribus/Freedom-E28Q-L.yaml
@@ -0,0 +1,440 @@
+---
+manufacturer: Pluribus
+model: Freedom E28Q-L
+slug: freedom-e28q-l
+part_number: E28Q-L
+u_height: 2
+is_full_depth: true
+weight: 25
+weight_unit: kg
+airflow: rear-to-front
+comments: '[Freedom E28Q-L Data Sheet](https://www.pluribusnetworks.com/assets/PluribusFreedomE28Q-LSwitchDatasheet8-17-1.pdf)| [Hardware Installation Guide](https://www.pluribusnetworks.com/assets/PN-HIG-E28Q.pdf)'
+console-ports:
+  - name: Console
+    type: rj-45
+    label: CON
+  - name: Console USB
+    type: usb-a
+    label: USB
+module-bays:
+  - name: PSU-1
+    label: '1'
+    position: PSU-1
+  - name: PSU-2
+    label: '2'
+    position: PSU-2
+  - name: PCIe slot 1 - FH
+    position: PCIe-1
+    label: PCIe 1
+  - name: PCIe slot 2 - FH
+    position: PCIe-2
+    label: PCIe 2
+interfaces:
+  - name: mgmt
+    label: MGMT
+    type: 1000base-t
+    mgmt_only: true
+  - name: '1'
+    type: 40gbase-x-qsfpp
+    label: '1'
+  - name: '2'
+    type: 40gbase-x-qsfpp
+    label: '2'
+  - name: '3'
+    type: 40gbase-x-qsfpp
+    label: '3'
+  - name: '4'
+    type: 40gbase-x-qsfpp
+    label: '4'
+  - name: '5'
+    type: 40gbase-x-qsfpp
+    label: 5..8
+  - name: 5-10GbE
+    type: 10gbase-x-sfpp
+    label: 5..8
+    description: Breakout child for port 5
+  - name: 6-10GbE
+    type: 10gbase-x-sfpp
+    label: 5..8
+    description: Breakout child for port 5
+  - name: 7-10GbE
+    type: 10gbase-x-sfpp
+    label: 5..8
+    description: Breakout child for port 5
+  - name: 8-10GbE
+    type: 10gbase-x-sfpp
+    label: 5..8
+    description: Breakout child for port 5
+  - name: '9'
+    type: 40gbase-x-qsfpp
+    label: 9..12
+  - name: 9-10GbE
+    type: 10gbase-x-sfpp
+    label: 9..12
+    description: Breakout child for port 9
+  - name: 10-10GbE
+    type: 10gbase-x-sfpp
+    label: 9..12
+    description: Breakout child for port 9
+  - name: 11-10GbE
+    type: 10gbase-x-sfpp
+    label: 9..12
+    description: Breakout child for port 9
+  - name: 12-10GbE
+    type: 10gbase-x-sfpp
+    label: 9..12
+    description: Breakout child for port 9
+  - name: '13'
+    type: 40gbase-x-qsfpp
+    label: 13..16
+  - name: 13-10GbE
+    type: 10gbase-x-sfpp
+    label: 13..16
+    description: Breakout child for port 13
+  - name: 14-10GbE
+    type: 10gbase-x-sfpp
+    label: 13..16
+    description: Breakout child for port 13
+  - name: 15-10GbE
+    type: 10gbase-x-sfpp
+    label: 13..16
+    description: Breakout child for port 13
+  - name: 16-10GbE
+    type: 10gbase-x-sfpp
+    label: 13..16
+    description: Breakout child for port 13
+  - name: '17'
+    type: 40gbase-x-qsfpp
+    label: 17..20
+  - name: 17-10GbE
+    type: 10gbase-x-sfpp
+    label: 17..20
+    description: Breakout child for port 17
+  - name: 18-10GbE
+    type: 10gbase-x-sfpp
+    label: 17..20
+    description: Breakout child for port 17
+  - name: 19-10GbE
+    type: 10gbase-x-sfpp
+    label: 17..20
+    description: Breakout child for port 17
+  - name: 20-10GbE
+    type: 10gbase-x-sfpp
+    label: 17..20
+    description: Breakout child for port 17
+  - name: '21'
+    type: 40gbase-x-qsfpp
+    label: 21..24
+  - name: 21-10GbE
+    type: 10gbase-x-sfpp
+    label: 21..24
+    description: Breakout child for port 21
+  - name: 22-10GbE
+    type: 10gbase-x-sfpp
+    label: 21..24
+    description: Breakout child for port 21
+  - name: 23-10GbE
+    type: 10gbase-x-sfpp
+    label: 21..24
+    description: Breakout child for port 21
+  - name: 24-10GbE
+    type: 10gbase-x-sfpp
+    label: 21..24
+    description: Breakout child for port 21
+  - name: '25'
+    type: 40gbase-x-qsfpp
+    label: 25..28
+  - name: 25-10GbE
+    type: 10gbase-x-sfpp
+    label: 25..28
+    description: Breakout child for port 25
+  - name: 26-10GbE
+    type: 10gbase-x-sfpp
+    label: 25..28
+    description: Breakout child for port 25
+  - name: 27-10GbE
+    type: 10gbase-x-sfpp
+    label: 25..28
+    description: Breakout child for port 25
+  - name: 28-10GbE
+    type: 10gbase-x-sfpp
+    label: 25..28
+    description: Breakout child for port 25
+  - name: '29'
+    type: 40gbase-x-qsfpp
+    label: 29..32
+  - name: 29-10GbE
+    type: 10gbase-x-sfpp
+    label: 29..32
+    description: Breakout child for port 29
+  - name: 30-10GbE
+    type: 10gbase-x-sfpp
+    label: 29..32
+    description: Breakout child for port 29
+  - name: 31-10GbE
+    type: 10gbase-x-sfpp
+    label: 29..32
+    description: Breakout child for port 29
+  - name: 32-10GbE
+    type: 10gbase-x-sfpp
+    label: 29..32
+    description: Breakout child for port 29
+  - name: '33'
+    type: 40gbase-x-qsfpp
+    label: 33..36
+  - name: 33-10GbE
+    type: 10gbase-x-sfpp
+    label: 33..36
+    description: Breakout child for port 33
+  - name: 34-10GbE
+    type: 10gbase-x-sfpp
+    label: 33..36
+    description: Breakout child for port 33
+  - name: 35-10GbE
+    type: 10gbase-x-sfpp
+    label: 33..36
+    description: Breakout child for port 33
+  - name: 36-10GbE
+    type: 10gbase-x-sfpp
+    label: 33..36
+    description: Breakout child for port 33
+  - name: '37'
+    type: 40gbase-x-qsfpp
+    label: 37..40
+  - name: 37-10GbE
+    type: 10gbase-x-sfpp
+    label: 37..40
+    description: Breakout child for port 37
+  - name: 38-10GbE
+    type: 10gbase-x-sfpp
+    label: 37..40
+    description: Breakout child for port 37
+  - name: 39-10GbE
+    type: 10gbase-x-sfpp
+    label: 37..40
+    description: Breakout child for port 37
+  - name: 40-10GbE
+    type: 10gbase-x-sfpp
+    label: 37..40
+    description: Breakout child for port 37
+  - name: '41'
+    type: 40gbase-x-qsfpp
+    label: 41..44
+  - name: 41-10GbE
+    type: 10gbase-x-sfpp
+    label: 41..44
+    description: Breakout child for port 41
+  - name: 42-10GbE
+    type: 10gbase-x-sfpp
+    label: 41..44
+    description: Breakout child for port 41
+  - name: 43-10GbE
+    type: 10gbase-x-sfpp
+    label: 41..44
+    description: Breakout child for port 41
+  - name: 44-10GbE
+    type: 10gbase-x-sfpp
+    label: 41..44
+    description: Breakout child for port 41
+  - name: '45'
+    type: 40gbase-x-qsfpp
+    label: 45..48
+  - name: 45-10GbE
+    type: 10gbase-x-sfpp
+    label: 45..48
+    description: Breakout child for port 45
+  - name: 46-10GbE
+    type: 10gbase-x-sfpp
+    label: 45..48
+    description: Breakout child for port 45
+  - name: 47-10GbE
+    type: 10gbase-x-sfpp
+    label: 45..48
+    description: Breakout child for port 45
+  - name: 48-10GbE
+    type: 10gbase-x-sfpp
+    label: 45..48
+    description: Breakout child for port 45
+  - name: '49'
+    type: 40gbase-x-qsfpp
+    label: 49..52
+  - name: 49-10GbE
+    type: 10gbase-x-sfpp
+    label: 49..52
+    description: Breakout child for port 49
+  - name: 50-10GbE
+    type: 10gbase-x-sfpp
+    label: 49..52
+    description: Breakout child for port 49
+  - name: 51-10GbE
+    type: 10gbase-x-sfpp
+    label: 49..52
+    description: Breakout child for port 49
+  - name: 52-10GbE
+    type: 10gbase-x-sfpp
+    label: 49..52
+    description: Breakout child for port 49
+  - name: '53'
+    type: 40gbase-x-qsfpp
+    label: 53..56
+  - name: 53-10GbE
+    type: 10gbase-x-sfpp
+    label: 53..56
+    description: Breakout child for port 53
+  - name: 54-10GbE
+    type: 10gbase-x-sfpp
+    label: 53..56
+    description: Breakout child for port 53
+  - name: 55-10GbE
+    type: 10gbase-x-sfpp
+    label: 53..56
+    description: Breakout child for port 53
+  - name: 56-10GbE
+    type: 10gbase-x-sfpp
+    label: 53..56
+    description: Breakout child for port 53
+  - name: '57'
+    type: 40gbase-x-qsfpp
+    label: 57..60
+  - name: 57-10GbE
+    type: 10gbase-x-sfpp
+    label: 57..60
+    description: Breakout child for port 57
+  - name: 58-10GbE
+    type: 10gbase-x-sfpp
+    label: 57..60
+    description: Breakout child for port 57
+  - name: 59-10GbE
+    type: 10gbase-x-sfpp
+    label: 57..60
+    description: Breakout child for port 57
+  - name: 60-10GbE
+    type: 10gbase-x-sfpp
+    label: 57..60
+    description: Breakout child for port 57
+  - name: '61'
+    type: 40gbase-x-qsfpp
+    label: 61..64
+  - name: 61-10GbE
+    type: 10gbase-x-sfpp
+    label: 61..64
+    description: Breakout child for port 61
+  - name: 62-10GbE
+    type: 10gbase-x-sfpp
+    label: 61..64
+    description: Breakout child for port 61
+  - name: 63-10GbE
+    type: 10gbase-x-sfpp
+    label: 61..64
+    description: Breakout child for port 61
+  - name: 64-10GbE
+    type: 10gbase-x-sfpp
+    label: 61..64
+    description: Breakout child for port 61
+  - name: '65'
+    type: 40gbase-x-qsfpp
+    label: 65..68
+  - name: 65-10GbE
+    type: 10gbase-x-sfpp
+    label: 65..68
+    description: Breakout child for port 65
+  - name: 66-10GbE
+    type: 10gbase-x-sfpp
+    label: 65..68
+    description: Breakout child for port 65
+  - name: 67-10GbE
+    type: 10gbase-x-sfpp
+    label: 65..68
+    description: Breakout child for port 65
+  - name: 68-10GbE
+    type: 10gbase-x-sfpp
+    label: 65..68
+    description: Breakout child for port 65
+  - name: '69'
+    type: 40gbase-x-qsfpp
+    label: 69..72
+  - name: 69-10GbE
+    type: 10gbase-x-sfpp
+    label: 69..72
+    description: Breakout child for port 69
+  - name: 70-10GbE
+    type: 10gbase-x-sfpp
+    label: 69..72
+    description: Breakout child for port 69
+  - name: 71-10GbE
+    type: 10gbase-x-sfpp
+    label: 69..72
+    description: Breakout child for port 69
+  - name: 72-10GbE
+    type: 10gbase-x-sfpp
+    label: 69..72
+    description: Breakout child for port 69
+  - name: '73'
+    type: 40gbase-x-qsfpp
+    label: 73..76
+  - name: 73-10GbE
+    type: 10gbase-x-sfpp
+    label: 73..76
+    description: Breakout child for port 73
+  - name: 74-10GbE
+    type: 10gbase-x-sfpp
+    label: 73..76
+    description: Breakout child for port 73
+  - name: 75-10GbE
+    type: 10gbase-x-sfpp
+    label: 73..76
+    description: Breakout child for port 73
+  - name: 76-10GbE
+    type: 10gbase-x-sfpp
+    label: 73..76
+    description: Breakout child for port 73
+  - name: '77'
+    type: 40gbase-x-qsfpp
+    label: 77..80
+  - name: 77-10GbE
+    type: 10gbase-x-sfpp
+    label: 77..80
+    description: Breakout child for port 77
+  - name: 78-10GbE
+    type: 10gbase-x-sfpp
+    label: 77..80
+    description: Breakout child for port 77
+  - name: 79-10GbE
+    type: 10gbase-x-sfpp
+    label: 77..80
+    description: Breakout child for port 77
+  - name: 80-10GbE
+    type: 10gbase-x-sfpp
+    label: 77..80
+    description: Breakout child for port 77
+  - name: '81'
+    type: 40gbase-x-qsfpp
+    label: 81..84
+  - name: 81-10GbE
+    type: 10gbase-x-sfpp
+    label: 81..84
+    description: Breakout child for port 81
+  - name: 82-10GbE
+    type: 10gbase-x-sfpp
+    label: 81..84
+    description: Breakout child for port 81
+  - name: 83-10GbE
+    type: 10gbase-x-sfpp
+    label: 81..84
+    description: Breakout child for port 81
+  - name: 84-10GbE
+    type: 10gbase-x-sfpp
+    label: 81..84
+    description: Breakout child for port 81
+  - name: '85'
+    type: 40gbase-x-qsfpp
+    label: '85'
+  - name: '86'
+    type: 40gbase-x-qsfpp
+    label: '86'
+  - name: '87'
+    type: 40gbase-x-qsfpp
+    label: '87'
+  - name: '88'
+    type: 40gbase-x-qsfpp
+    label: '88'
diff --git a/elevation-images/Dell/dell-poweredge-r630.front.png b/elevation-images/Dell/dell-poweredge-r630.front.png
new file mode 100644
index 000000000..a434f4df2
Binary files /dev/null and b/elevation-images/Dell/dell-poweredge-r630.front.png differ
diff --git a/elevation-images/Dell/dell-poweredge-r630.rear.png b/elevation-images/Dell/dell-poweredge-r630.rear.png
new file mode 100644
index 000000000..0bfaa0328
Binary files /dev/null and b/elevation-images/Dell/dell-poweredge-r630.rear.png differ
diff --git a/elevation-images/Dell/dell-poweredge-r730xd.front.png b/elevation-images/Dell/dell-poweredge-r730xd.front.png
new file mode 100644
index 000000000..1b1432d99
Binary files /dev/null and b/elevation-images/Dell/dell-poweredge-r730xd.front.png differ
diff --git a/elevation-images/Dell/dell-poweredge-r730xd.rear.png b/elevation-images/Dell/dell-poweredge-r730xd.rear.png
new file mode 100644
index 000000000..a0df44311
Binary files /dev/null and b/elevation-images/Dell/dell-poweredge-r730xd.rear.png differ
diff --git a/elevation-images/Dell/dell-poweredge-r750.front.png b/elevation-images/Dell/dell-poweredge-r750.front.png
new file mode 100644
index 000000000..6890d7d3b
Binary files /dev/null and b/elevation-images/Dell/dell-poweredge-r750.front.png differ
diff --git a/elevation-images/Dell/dell-poweredge-r750.rear.png b/elevation-images/Dell/dell-poweredge-r750.rear.png
new file mode 100644
index 000000000..ac162b925
Binary files /dev/null and b/elevation-images/Dell/dell-poweredge-r750.rear.png differ
diff --git a/elevation-images/Juniper/juniper-ex2300-24t.front.png b/elevation-images/Juniper/juniper-ex2300-24t.front.png
new file mode 100644
index 000000000..d7f60a04e
Binary files /dev/null and b/elevation-images/Juniper/juniper-ex2300-24t.front.png differ
diff --git a/elevation-images/Juniper/juniper-ex2300-24t.rear.png b/elevation-images/Juniper/juniper-ex2300-24t.rear.png
new file mode 100644
index 000000000..a50f9fcb8
Binary files /dev/null and b/elevation-images/Juniper/juniper-ex2300-24t.rear.png differ
diff --git a/elevation-images/Juniper/juniper-qfx10002-36q.front.png b/elevation-images/Juniper/juniper-qfx10002-36q.front.png
new file mode 100644
index 000000000..918ba25aa
Binary files /dev/null and b/elevation-images/Juniper/juniper-qfx10002-36q.front.png differ
diff --git a/elevation-images/Juniper/juniper-qfx10002-36q.rear.png b/elevation-images/Juniper/juniper-qfx10002-36q.rear.png
new file mode 100644
index 000000000..c1cdef9a0
Binary files /dev/null and b/elevation-images/Juniper/juniper-qfx10002-36q.rear.png differ
diff --git a/elevation-images/Juniper/juniper-qfx5210-64c.front.png b/elevation-images/Juniper/juniper-qfx5210-64c.front.png
new file mode 100644
index 000000000..bf21bee26
Binary files /dev/null and b/elevation-images/Juniper/juniper-qfx5210-64c.front.png differ
diff --git a/elevation-images/Juniper/juniper-qfx5210-64c.rear.png b/elevation-images/Juniper/juniper-qfx5210-64c.rear.png
new file mode 100644
index 000000000..57b86d294
Binary files /dev/null and b/elevation-images/Juniper/juniper-qfx5210-64c.rear.png differ
diff --git a/elevation-images/Pluribus/freedom-e28q-l.front.png b/elevation-images/Pluribus/freedom-e28q-l.front.png
new file mode 100644
index 000000000..05b6d445f
Binary files /dev/null and b/elevation-images/Pluribus/freedom-e28q-l.front.png differ
diff --git a/elevation-images/Pluribus/freedom-e28q-l.rear.png b/elevation-images/Pluribus/freedom-e28q-l.rear.png
new file mode 100644
index 000000000..bff654545
Binary files /dev/null and b/elevation-images/Pluribus/freedom-e28q-l.rear.png differ
diff --git a/module-images/Dell/4V8KD-0.png b/module-images/Dell/4V8KD-0.png
new file mode 100644
index 000000000..bf64e1f4e
Binary files /dev/null and b/module-images/Dell/4V8KD-0.png differ
diff --git a/module-images/Dell/4V8KD-1.png b/module-images/Dell/4V8KD-1.png
new file mode 100644
index 000000000..e3a67cb36
Binary files /dev/null and b/module-images/Dell/4V8KD-1.png differ
diff --git a/module-images/Dell/4V8KD-2.png b/module-images/Dell/4V8KD-2.png
new file mode 100644
index 000000000..860ca70df
Binary files /dev/null and b/module-images/Dell/4V8KD-2.png differ
diff --git a/module-images/Dell/4V8KD-3.png b/module-images/Dell/4V8KD-3.png
new file mode 100644
index 000000000..1a2828fcb
Binary files /dev/null and b/module-images/Dell/4V8KD-3.png differ
diff --git a/module-images/Dell/4V8KD-4.png b/module-images/Dell/4V8KD-4.png
new file mode 100644
index 000000000..f8256ee43
Binary files /dev/null and b/module-images/Dell/4V8KD-4.png differ
diff --git a/module-images/Dell/61X09-front.png b/module-images/Dell/61X09-front.png
new file mode 100644
index 000000000..0bbb87146
Binary files /dev/null and b/module-images/Dell/61X09-front.png differ
diff --git a/module-images/Dell/68M95-angle.png b/module-images/Dell/68M95-angle.png
new file mode 100644
index 000000000..cf186cf32
Binary files /dev/null and b/module-images/Dell/68M95-angle.png differ
diff --git a/module-images/Dell/68M95-front.png b/module-images/Dell/68M95-front.png
new file mode 100644
index 000000000..215232fd6
Binary files /dev/null and b/module-images/Dell/68M95-front.png differ
diff --git a/module-images/Dell/68M95-top.png b/module-images/Dell/68M95-top.png
new file mode 100644
index 000000000..560a85619
Binary files /dev/null and b/module-images/Dell/68M95-top.png differ
diff --git a/module-images/Dell/68M95.png b/module-images/Dell/68M95.png
index d77d91579..ff114c9ea 100644
Binary files a/module-images/Dell/68M95.png and b/module-images/Dell/68M95.png differ
diff --git a/module-images/Dell/942V6.png b/module-images/Dell/942V6.png
new file mode 100644
index 000000000..1aac5953e
Binary files /dev/null and b/module-images/Dell/942V6.png differ
diff --git a/module-images/Dell/C63DV.png b/module-images/Dell/C63DV.png
new file mode 100644
index 000000000..c717a09ca
Binary files /dev/null and b/module-images/Dell/C63DV.png differ
diff --git a/module-images/Dell/CD16M-front.png b/module-images/Dell/CD16M-front.png
new file mode 100644
index 000000000..e152cbc5c
Binary files /dev/null and b/module-images/Dell/CD16M-front.png differ
diff --git a/module-images/Dell/CD16M-side.png b/module-images/Dell/CD16M-side.png
new file mode 100644
index 000000000..bbc005a66
Binary files /dev/null and b/module-images/Dell/CD16M-side.png differ
diff --git a/module-images/Dell/DDJKY.png b/module-images/Dell/DDJKY.png
new file mode 100644
index 000000000..b51384dd9
Binary files /dev/null and b/module-images/Dell/DDJKY.png differ
diff --git a/module-images/Dell/M63JN-0.png b/module-images/Dell/M63JN-0.png
new file mode 100644
index 000000000..1ca057991
Binary files /dev/null and b/module-images/Dell/M63JN-0.png differ
diff --git a/module-images/Dell/M63JN-1.png b/module-images/Dell/M63JN-1.png
new file mode 100644
index 000000000..25336197f
Binary files /dev/null and b/module-images/Dell/M63JN-1.png differ
diff --git a/module-images/Dell/M63JN-2.png b/module-images/Dell/M63JN-2.png
new file mode 100644
index 000000000..68448ae85
Binary files /dev/null and b/module-images/Dell/M63JN-2.png differ
diff --git a/module-images/Dell/M63JN-3.png b/module-images/Dell/M63JN-3.png
new file mode 100644
index 000000000..27d1b37be
Binary files /dev/null and b/module-images/Dell/M63JN-3.png differ
diff --git a/module-images/Dell/M63JN-4.png b/module-images/Dell/M63JN-4.png
new file mode 100644
index 000000000..26e8700ff
Binary files /dev/null and b/module-images/Dell/M63JN-4.png differ
diff --git a/module-images/Dell/PJMDN-0.png b/module-images/Dell/PJMDN-0.png
new file mode 100644
index 000000000..f97af021d
Binary files /dev/null and b/module-images/Dell/PJMDN-0.png differ
diff --git a/module-images/Dell/PJMDN-1.png b/module-images/Dell/PJMDN-1.png
new file mode 100644
index 000000000..5fcd89a30
Binary files /dev/null and b/module-images/Dell/PJMDN-1.png differ
diff --git a/module-images/Dell/PJMDN-2.png b/module-images/Dell/PJMDN-2.png
new file mode 100644
index 000000000..3ad002567
Binary files /dev/null and b/module-images/Dell/PJMDN-2.png differ
diff --git a/module-images/Dell/R1KTR-front.png b/module-images/Dell/R1KTR-front.png
new file mode 100644
index 000000000..c175ffb58
Binary files /dev/null and b/module-images/Dell/R1KTR-front.png differ
diff --git a/module-images/Dell/R1XFC.png b/module-images/Dell/R1XFC.png
new file mode 100644
index 000000000..26fb55fa6
Binary files /dev/null and b/module-images/Dell/R1XFC.png differ
diff --git a/module-images/Dell/VK88G.png b/module-images/Dell/VK88G.png
new file mode 100644
index 000000000..bbc117ac1
Binary files /dev/null and b/module-images/Dell/VK88G.png differ
diff --git a/module-types/Dell/4V8KD.yaml b/module-types/Dell/4V8KD.yaml
new file mode 100644
index 000000000..81be799c8
--- /dev/null
+++ b/module-types/Dell/4V8KD.yaml
@@ -0,0 +1,9 @@
+---
+manufacturer: Dell
+model: 4V8KD
+part_number: 4V8KD
+comments: Dell PowerEdge 14G (R640 R740) 750W 80+ Platinum AC Power Supply, Hotplug
+power-ports:
+  - name: '{module}-pwr0'
+    type: iec-60320-c14
+    maximum_draw: 750
diff --git a/module-types/Dell/61X09.yaml b/module-types/Dell/61X09.yaml
new file mode 100644
index 000000000..8862a21c7
--- /dev/null
+++ b/module-types/Dell/61X09.yaml
@@ -0,0 +1,15 @@
+---
+manufacturer: Dell
+model: 61X09
+part_number: 61X09
+comments: Intel E810-XXV Dual Port 10/25 GbE SFP28, OCP NIC 3.0\n [Dell Specs](https://www.dell.com/en-us/shop/intel-e810-xxv-25gbe-sfp28-dual-port-ocp-30/apd/540-bcxy/networking#techspecs_section)\n
+  [Intel Specs](https://ark.intel.com/content/www/us/en/ark/products/97303/intel-ethernet-network-adapter-xxv710da2-for-ocp.html)
+interfaces:
+  - name: '{module}-25GbE-0'
+    label: P1
+    type: 25gbase-x-sfp28
+    mgmt_only: false
+  - name: '{module}-25GbE-1'
+    label: P2
+    type: 25gbase-x-sfp28
+    mgmt_only: false
diff --git a/module-types/Dell/68M95.yaml b/module-types/Dell/68M95.yaml
new file mode 100644
index 000000000..409878fe8
--- /dev/null
+++ b/module-types/Dell/68M95.yaml
@@ -0,0 +1,23 @@
+---
+manufacturer: Dell
+model: 68M95
+part_number: 68M95
+comments: Intel X710 Quad Port 10GbE SFP +, rNDC\n [Dell Specs](https://www.dell.com/en-in/work/shop/dell-intel-x710-quad-port-10gb-da-sfp-ethernet-network-daughter-card-customer-install/apd/555-bckl/networking#techspecs_section)\n
+  [Intel Specs](https://www.intel.com/content/www/us/en/products/sku/184822/intel-ethernet-network-adapter-x710da4-for-ocp-3-0/specifications.html)
+interfaces:
+  - name: '{module}-10GbE-0'
+    label: '1'
+    type: 10gbase-x-sfpp
+    mgmt_only: false
+  - name: '{module}-10GbE-1'
+    label: '2'
+    type: 10gbase-x-sfpp
+    mgmt_only: false
+  - name: '{module}-10GbE-2'
+    label: '3'
+    type: 10gbase-x-sfpp
+    mgmt_only: false
+  - name: '{module}-10GbE-3'
+    label: '4'
+    type: 10gbase-x-sfpp
+    mgmt_only: false
diff --git a/module-types/Dell/942V6.yaml b/module-types/Dell/942V6.yaml
new file mode 100644
index 000000000..d90eaddd6
--- /dev/null
+++ b/module-types/Dell/942V6.yaml
@@ -0,0 +1,12 @@
+---
+manufacturer: Dell
+model: 942V6
+part_number: 942V6
+comments: Intel X520 DP 10Gb DA/SFP+ Server Adapter, Low Profile\n[Specs](https://www.dell.com/en-us/shop/intel-ethernet-x520-dp-10gb-da-sfp-server-adapter-low-profile-customer-installation/apd/430-4436/pc-accessories#techspecs_section)
+interfaces:
+  - name: '{module}-10GbE-0'
+    type: 10gbase-x-sfpp
+    mgmt_only: false
+  - name: '{module}-10GbE-1'
+    type: 10gbase-x-sfpp
+    mgmt_only: false
diff --git a/module-types/Dell/C63DV.yaml b/module-types/Dell/C63DV.yaml
new file mode 100644
index 000000000..11f2804ff
--- /dev/null
+++ b/module-types/Dell/C63DV.yaml
@@ -0,0 +1,18 @@
+---
+manufacturer: Dell
+model: C63DV
+part_number: C63DV
+comments: Intel X520 DP 10Gb DA/SFP+ + I350 DP 1Gb Network Daughter Card  [Specs](https://www.dell.com/en-hk/shop/intel-x520-dual-port-10gigabit-da-sfp-i350-dual-port-1gigabit-ethernet-network-daughter-card/apd/540-bbhj/networking#techspecs_section)
+interfaces:
+  - name: '{module}-1GbE-0'
+    type: 1000base-t
+    mgmt_only: false
+  - name: '{module}-1GbE-1'
+    type: 1000base-t
+    mgmt_only: false
+  - name: '{module}-10GbE-0'
+    type: 10gbase-x-sfpp
+    mgmt_only: false
+  - name: '{module}-10GbE-1'
+    type: 10gbase-x-sfpp
+    mgmt_only: false
diff --git a/module-types/Dell/CD16M.yaml b/module-types/Dell/CD16M.yaml
new file mode 100644
index 000000000..ae93cd2c4
--- /dev/null
+++ b/module-types/Dell/CD16M.yaml
@@ -0,0 +1,15 @@
+---
+manufacturer: Dell
+model: CD16M
+part_number: CD16M
+comments: Intel E810-XXV Dual Port 10/25 GbE SFP28 Adapter, PCIe Full Height\n [Dell Specs](https://www.dell.com/en-us/shop/intel-e810-xxv-dual-port-25gbe-sfp28-pcie-adapter-full-height/apd/540-bcyl/networking#techspecs_section)\n
+  [Intel Specs](https://www.intel.com/content/www/us/en/products/sku/189760/intel-ethernet-network-adapter-e810xxvda2/specifications.html)
+interfaces:
+  - name: '{module}-25GbE-0'
+    label: '1'
+    type: 25gbase-x-sfp28
+    mgmt_only: false
+  - name: '{module}-25GbE-1'
+    label: '2'
+    type: 25gbase-x-sfp28
+    mgmt_only: false
diff --git a/module-types/Dell/DDJKY.yaml b/module-types/Dell/DDJKY.yaml
new file mode 100644
index 000000000..f4744f3c6
--- /dev/null
+++ b/module-types/Dell/DDJKY.yaml
@@ -0,0 +1,23 @@
+---
+manufacturer: Dell
+model: DDJKY
+part_number: DDJKY
+comments: Intel X710 Quad Port 10GbE Direct Attach SFP+ Adapter, PCIe Full Height\n [Dell Specs](https://www.dell.com/en-us/shop/intel-x710-quad-port-10gb-direct-attach-sfp-converged-network-adapter-full-height/apd/540-bbiw/networking#techspecs_section)\n
+  [Intel Specs](https://www.intel.com/content/www/us/en/products/sku/83965/intel-ethernet-converged-network-adapter-x710da4/specifications.html)
+interfaces:
+  - name: '{module}-10GbE-0'
+    label: '1'
+    type: 10gbase-x-sfpp
+    mgmt_only: false
+  - name: '{module}-10GbE-1'
+    label: '2'
+    type: 10gbase-x-sfpp
+    mgmt_only: false
+  - name: '{module}-10GbE-2'
+    label: '3'
+    type: 10gbase-x-sfpp
+    mgmt_only: false
+  - name: '{module}-10GbE-3'
+    label: '4'
+    type: 10gbase-x-sfpp
+    mgmt_only: false
diff --git a/module-types/Dell/M63JN.yaml b/module-types/Dell/M63JN.yaml
new file mode 100644
index 000000000..2119bf528
--- /dev/null
+++ b/module-types/Dell/M63JN.yaml
@@ -0,0 +1,9 @@
+---
+manufacturer: Dell
+model: M63JN
+part_number: M63JN
+comments: Dell PowerEdge 15G (R650 R6525 R750 R7525) 2400W 80+ Platinum 86mm AC Power Supply
+power-ports:
+  - name: '{module}-pwr0'
+    type: iec-60320-c20
+    maximum_draw: 2400
diff --git a/module-types/Dell/PJMDN.yaml b/module-types/Dell/PJMDN.yaml
new file mode 100644
index 000000000..dbbb81404
--- /dev/null
+++ b/module-types/Dell/PJMDN.yaml
@@ -0,0 +1,9 @@
+---
+manufacturer: Dell
+model: PJMDN
+part_number: PJMDN
+comments: Dell PowerEdge 13G (R630 R730) 750W 80+ Platinum AC Power Supply, Hotplug
+power-ports:
+  - name: '{module}-pwr0'
+    type: iec-60320-c14
+    maximum_draw: 750
diff --git a/module-types/Dell/R1KTR.yaml b/module-types/Dell/R1KTR.yaml
new file mode 100644
index 000000000..f67874f1a
--- /dev/null
+++ b/module-types/Dell/R1KTR.yaml
@@ -0,0 +1,23 @@
+---
+manufacturer: Dell
+model: R1KTR
+part_number: R1KTR
+comments: Intel E810-XXVDA4 Quad Port 10 /25GbE SFP28 Adapter, OCP NIC 3.0\n [Dell Specs](https://www.dell.com/en-sg/shop/intel-e810-quad-port-10-25gbe-sfp28-adapter-ocp-network-interface-card-30/apd/540-bddt/networking#compatibility_section)\n
+  [Intel Specs](https://ark.intel.com/content/www/us/en/ark/products/184820/intel-ethernet-network-adapter-e810xxvda4-for-ocp-3-0.html)
+interfaces:
+  - name: '{module}-25GbE-0'
+    label: '1'
+    type: 25gbase-x-sfp28
+    mgmt_only: false
+  - name: '{module}-25GbE-1'
+    label: '2'
+    type: 25gbase-x-sfp28
+    mgmt_only: false
+  - name: '{module}-25GbE-2'
+    label: '3'
+    type: 25gbase-x-sfp28
+    mgmt_only: false
+  - name: '{module}-25GbE-3'
+    label: '4'
+    type: 25gbase-x-sfp28
+    mgmt_only: false
diff --git a/module-types/Dell/R1XFC.yaml b/module-types/Dell/R1XFC.yaml
new file mode 100644
index 000000000..d6488e5e6
--- /dev/null
+++ b/module-types/Dell/R1XFC.yaml
@@ -0,0 +1,18 @@
+---
+manufacturer: Dell
+model: R1XFC
+part_number: R1XFC
+comments: Intel Ethernet i350 QP 1Gb Network Daughter Card\n[Specs](https://www.dell.com/en-us/shop/intel-ethernet-i350-qp-1gb-server-adapter-network-daughter-card-customer-installation/apd/430-4437/pc-accessories#techspecs_section)
+interfaces:
+  - name: '{module}-1GbE-0'
+    type: 1000base-t
+    mgmt_only: false
+  - name: '{module}-1GbE-1'
+    type: 1000base-t
+    mgmt_only: false
+  - name: '{module}-1GbE-2'
+    type: 1000base-t
+    mgmt_only: false
+  - name: '{module}-1GbE-3'
+    type: 1000base-t
+    mgmt_only: false
diff --git a/module-types/Dell/VK88G.yaml b/module-types/Dell/VK88G.yaml
new file mode 100644
index 000000000..3e8ac30ac
--- /dev/null
+++ b/module-types/Dell/VK88G.yaml
@@ -0,0 +1,23 @@
+---
+manufacturer: Dell
+model: VK88G
+part_number: VK88G
+comments: Intel E810-XXVDA4 Quad Port 10 /25GbE SFP28 Adapter, PCIe Full Height\n [Dell Specs](https://www.dell.com/en-hk/shop/intel-e810-xxvda4tg1-quad-port-10-25gbe-sfp28-precision-timing-adapter-pcie-full-height/apd/540-bdjk/networking#techspecs_section)\n
+  [Intel Specs](https://ark.intel.com/content/www/us/en/ark/products/192560/intel-ethernet-network-adapter-e810xxvda4.html)
+interfaces:
+  - name: '{module}-25GbE-0'
+    label: '1'
+    type: 25gbase-x-sfp28
+    mgmt_only: false
+  - name: '{module}-25GbE-1'
+    label: '2'
+    type: 25gbase-x-sfp28
+    mgmt_only: false
+  - name: '{module}-25GbE-2'
+    label: '3'
+    type: 25gbase-x-sfp28
+    mgmt_only: false
+  - name: '{module}-25GbE-3'
+    label: '4'
+    type: 25gbase-x-sfp28
+    mgmt_only: false
diff --git a/module-types/Pluribus/E28Q-FAN.yaml b/module-types/Pluribus/E28Q-FAN.yaml
new file mode 100644
index 000000000..02f0d2a42
--- /dev/null
+++ b/module-types/Pluribus/E28Q-FAN.yaml
@@ -0,0 +1,5 @@
+---
+manufacturer: Pluribus
+model: E28Q-FAN
+part_number: E28Q-FAN
+comments: E28Q Fan Module
diff --git a/module-types/Pluribus/E28Q-FANR.yaml b/module-types/Pluribus/E28Q-FANR.yaml
new file mode 100644
index 000000000..fdb07c021
--- /dev/null
+++ b/module-types/Pluribus/E28Q-FANR.yaml
@@ -0,0 +1,5 @@
+---
+manufacturer: Pluribus
+model: E28Q-FANR
+part_number: E28Q-FANR
+comments: E28Q Fan Module
diff --git a/module-types/Pluribus/E28Q-PSU.yaml b/module-types/Pluribus/E28Q-PSU.yaml
new file mode 100644
index 000000000..d5c6bdf13
--- /dev/null
+++ b/module-types/Pluribus/E28Q-PSU.yaml
@@ -0,0 +1,9 @@
+---
+manufacturer: Pluribus
+model: E28Q-PSU
+part_number: E28Q-PSU
+comments: E28Q Power Supply Unit (AC 105-240V 50/60Hz)
+power-ports:
+  - name: '{module}-pwr0'
+    type: iec-60320-c14
+    maximum_draw: 1000