diff --git a/device-types/Allied Telesis/x930-28GPX.yaml b/device-types/Allied Telesis/x930-28GPX.yaml
index 8c987057..e8e9347c 100644
--- a/device-types/Allied Telesis/x930-28GPX.yaml	
+++ b/device-types/Allied Telesis/x930-28GPX.yaml	
@@ -8,13 +8,6 @@ is_full_depth: false
 console-ports:
   - name: Console
     type: rj-45
-power-ports:
-  - name: PSU A
-    type: iec-60320-c14
-    maximum_draw: 810
-  - name: PSU B
-    type: iec-60320-c14
-    maximum_draw: 810
 interfaces:
   - name: port1.0.1
     type: 1000base-t
@@ -104,5 +97,9 @@ interfaces:
     type: 1000base-t
     mgmt_only: true
 module-bays:
+  - name: PSU A
+    position: 'A'
+  - name: PSU B
+    position: 'B'
   - name: Rear Slot
     position: '1'
diff --git a/device-types/Allied Telesis/x930-28GSTX.yaml b/device-types/Allied Telesis/x930-28GSTX.yaml
index 84c157d6..943c9cb8 100644
--- a/device-types/Allied Telesis/x930-28GSTX.yaml	
+++ b/device-types/Allied Telesis/x930-28GSTX.yaml	
@@ -9,13 +9,6 @@ comments: Every physical front port is a 1000BASE-T/SFP combo port
 console-ports:
   - name: Console
     type: rj-45
-power-ports:
-  - name: PSU A
-    type: iec-60320-c14
-    maximum_draw: 97
-  - name: PSU B
-    type: iec-60320-c14
-    maximum_draw: 97
 interfaces:
   - name: port1.0.1
     type: 1000base-t
@@ -105,5 +98,9 @@ interfaces:
     type: 1000base-t
     mgmt_only: true
 module-bays:
+  - name: PSU A
+    position: 'A'
+  - name: PSU B
+    position: 'B'
   - name: Rear Slot
     position: '1'
diff --git a/device-types/Allied Telesis/x930-28GTX.yaml b/device-types/Allied Telesis/x930-28GTX.yaml
index d86beabe..f143cc5f 100644
--- a/device-types/Allied Telesis/x930-28GTX.yaml	
+++ b/device-types/Allied Telesis/x930-28GTX.yaml	
@@ -8,13 +8,6 @@ is_full_depth: false
 console-ports:
   - name: Console
     type: rj-45
-power-ports:
-  - name: PSU A
-    type: iec-60320-c14
-    maximum_draw: 84
-  - name: PSU B
-    type: iec-60320-c14
-    maximum_draw: 84
 interfaces:
   - name: port1.0.1
     type: 1000base-t
@@ -104,5 +97,9 @@ interfaces:
     type: 1000base-t
     mgmt_only: true
 module-bays:
+  - name: PSU A
+    position: 'A'
+  - name: PSU B
+    position: 'B'
   - name: Rear Slot
     position: '1'
diff --git a/device-types/Allied Telesis/x930-52GPX.yaml b/device-types/Allied Telesis/x930-52GPX.yaml
index 7e4abdd4..33b88056 100644
--- a/device-types/Allied Telesis/x930-52GPX.yaml	
+++ b/device-types/Allied Telesis/x930-52GPX.yaml	
@@ -8,13 +8,6 @@ is_full_depth: false
 console-ports:
   - name: Console
     type: rj-45
-power-ports:
-  - name: PSU A
-    type: iec-60320-c14
-    maximum_draw: 810
-  - name: PSU B
-    type: iec-60320-c14
-    maximum_draw: 810
 interfaces:
   - name: port1.0.1
     type: 1000base-t
@@ -176,5 +169,9 @@ interfaces:
     type: 1000base-t
     mgmt_only: true
 module-bays:
+  - name: PSU A
+    position: 'A'
+  - name: PSU B
+    position: 'B'
   - name: Rear Slot
     position: '1'
diff --git a/device-types/Allied Telesis/x930-52GTX.yaml b/device-types/Allied Telesis/x930-52GTX.yaml
index 4d17475e..46f544db 100644
--- a/device-types/Allied Telesis/x930-52GTX.yaml	
+++ b/device-types/Allied Telesis/x930-52GTX.yaml	
@@ -8,13 +8,6 @@ is_full_depth: false
 console-ports:
   - name: Console
     type: rj-45
-power-ports:
-  - name: PSU A
-    type: iec-60320-c14
-    maximum_draw: 95
-  - name: PSU B
-    type: iec-60320-c14
-    maximum_draw: 95
 interfaces:
   - name: port1.0.1
     type: 1000base-t
@@ -176,5 +169,9 @@ interfaces:
     type: 1000base-t
     mgmt_only: true
 module-bays:
+  - name: PSU A
+    position: 'A'
+  - name: PSU B
+    position: 'B'
   - name: Rear Slot
     position: '1'
diff --git a/device-types/Allied Telesis/x950-28XSQ.yaml b/device-types/Allied Telesis/x950-28XSQ.yaml
index c5dbecda..5be9f7a0 100644
--- a/device-types/Allied Telesis/x950-28XSQ.yaml	
+++ b/device-types/Allied Telesis/x950-28XSQ.yaml	
@@ -8,13 +8,6 @@ is_full_depth: true
 console-ports:
   - name: Console
     type: rj-45
-power-ports:
-  - name: PSU A
-    type: iec-60320-c14
-    maximum_draw: 300
-  - name: PSU B
-    type: iec-60320-c14
-    maximum_draw: 300
 interfaces:
   - name: port1.0.1
     type: 10gbase-x-sfpp
@@ -104,5 +97,16 @@ interfaces:
     type: 1000base-t
     mgmt_only: true
 module-bays:
+  - name: PSU A
+    position: 'A'
+  - name: PSU B
+    position: 'B'
   - name: Slot 1
     position: '1'
+inventory-items:
+  - name: Fan-Module A
+    manufacturer: Allied Telesis
+    part_id: AT-SBxFAN05
+  - name: Fan-Module B
+    manufacturer: Allied Telesis
+    part_id: AT-SBxFAN05
diff --git a/device-types/Allied Telesis/x950-28XTQm.yaml b/device-types/Allied Telesis/x950-28XTQm.yaml
index 57aed28b..f16a48d7 100644
--- a/device-types/Allied Telesis/x950-28XTQm.yaml	
+++ b/device-types/Allied Telesis/x950-28XTQm.yaml	
@@ -8,13 +8,6 @@ is_full_depth: true
 console-ports:
   - name: Console
     type: rj-45
-power-ports:
-  - name: PSU A
-    type: iec-60320-c14
-    maximum_draw: 300
-  - name: PSU B
-    type: iec-60320-c14
-    maximum_draw: 300
 interfaces:
   - name: port1.0.1
     type: 10gbase-t
@@ -104,5 +97,16 @@ interfaces:
     type: 1000base-t
     mgmt_only: true
 module-bays:
+  - name: PSU A
+    position: 'A'
+  - name: PSU B
+    position: 'B'
   - name: Slot 1
     position: '1'
+inventory-items:
+  - name: Fan-Module A
+    manufacturer: Allied Telesis
+    part_id: AT-SBxFAN05
+  - name: Fan-Module B
+    manufacturer: Allied Telesis
+    part_id: AT-SBxFAN05
diff --git a/device-types/Allied Telesis/x950-52XSQ.yaml b/device-types/Allied Telesis/x950-52XSQ.yaml
index 9fdde3c2..b439e1eb 100644
--- a/device-types/Allied Telesis/x950-52XSQ.yaml	
+++ b/device-types/Allied Telesis/x950-52XSQ.yaml	
@@ -8,13 +8,11 @@ is_full_depth: true
 console-ports:
   - name: Console
     type: rj-45
-power-ports:
+module-bays:
   - name: PSU A
-    type: iec-60320-c14
-    maximum_draw: 300
+    position: 'A'
   - name: PSU B
-    type: iec-60320-c14
-    maximum_draw: 300
+    position: 'B'
 interfaces:
   - name: port1.0.1
     type: 10gbase-x-sfpp
@@ -175,3 +173,10 @@ interfaces:
   - name: eth0
     type: 1000base-t
     mgmt_only: true
+inventory-items:
+  - name: Fan-Module A
+    manufacturer: Allied Telesis
+    part_id: AT-SBxFAN05
+  - name: Fan-Module B
+    manufacturer: Allied Telesis
+    part_id: AT-SBxFAN05
diff --git a/device-types/Allied Telesis/x950-52XTQm.yaml b/device-types/Allied Telesis/x950-52XTQm.yaml
index a0b27259..8953d2c8 100644
--- a/device-types/Allied Telesis/x950-52XTQm.yaml	
+++ b/device-types/Allied Telesis/x950-52XTQm.yaml	
@@ -8,13 +8,11 @@ is_full_depth: true
 console-ports:
   - name: Console
     type: rj-45
-power-ports:
+module-bays:
   - name: PSU A
-    type: iec-60320-c14
-    maximum_draw: 300
+    position: 'A'
   - name: PSU B
-    type: iec-60320-c14
-    maximum_draw: 300
+    position: 'B'
 interfaces:
   - name: port1.0.1
     type: 10gbase-t
@@ -175,3 +173,10 @@ interfaces:
   - name: eth0
     type: 1000base-t
     mgmt_only: true
+inventory-items:
+  - name: Fan-Module A
+    manufacturer: Allied Telesis
+    part_id: AT-SBxFAN05
+  - name: Fan-Module B
+    manufacturer: Allied Telesis
+    part_id: AT-SBxFAN05
diff --git a/module-types/Allied Telesis/PWR1200.yaml b/module-types/Allied Telesis/PWR1200.yaml
new file mode 100644
index 00000000..26b0a046
--- /dev/null
+++ b/module-types/Allied Telesis/PWR1200.yaml	
@@ -0,0 +1,8 @@
+---
+manufacturer: Allied Telesis
+model: PWR1200
+part_number: AT-PWR1200
+power-ports:
+  - name: PSU {module}
+    type: iec-60320-c14
+    maximum_draw: 1200
diff --git a/module-types/Allied Telesis/PWR150.yaml b/module-types/Allied Telesis/PWR150.yaml
new file mode 100644
index 00000000..1fbfbb0c
--- /dev/null
+++ b/module-types/Allied Telesis/PWR150.yaml	
@@ -0,0 +1,8 @@
+---
+manufacturer: Allied Telesis
+model: PWR150
+part_number: AT-PWR150
+power-ports:
+  - name: PSU {module}
+    type: iec-60320-c14
+    maximum_draw: 150
diff --git a/module-types/Allied Telesis/PWR250.yaml b/module-types/Allied Telesis/PWR250.yaml
new file mode 100644
index 00000000..a56fe905
--- /dev/null
+++ b/module-types/Allied Telesis/PWR250.yaml	
@@ -0,0 +1,8 @@
+---
+manufacturer: Allied Telesis
+model: PWR250
+part_number: AT-PWR250
+power-ports:
+  - name: PSU {module}
+    type: dc-terminal
+    maximum_draw: 250
diff --git a/module-types/Allied Telesis/PWR600-DC.yaml b/module-types/Allied Telesis/PWR600-DC.yaml
new file mode 100644
index 00000000..24f167fe
--- /dev/null
+++ b/module-types/Allied Telesis/PWR600-DC.yaml	
@@ -0,0 +1,8 @@
+---
+manufacturer: Allied Telesis
+model: PWR600
+part_number: AT-PWR600
+power-ports:
+  - name: PSU {module}
+    type: dc-terminal
+    maximum_draw: 600
diff --git a/module-types/Allied Telesis/PWR600.yaml b/module-types/Allied Telesis/PWR600.yaml
new file mode 100644
index 00000000..cfe5f768
--- /dev/null
+++ b/module-types/Allied Telesis/PWR600.yaml	
@@ -0,0 +1,8 @@
+---
+manufacturer: Allied Telesis
+model: PWR600
+part_number: AT-PWR600
+power-ports:
+  - name: PSU {module}
+    type: iec-60320-c14
+    maximum_draw: 600
diff --git a/module-types/Allied Telesis/PWR800.yaml b/module-types/Allied Telesis/PWR800.yaml
new file mode 100644
index 00000000..879af75e
--- /dev/null
+++ b/module-types/Allied Telesis/PWR800.yaml	
@@ -0,0 +1,8 @@
+---
+manufacturer: Allied Telesis
+model: PWR800
+part_number: AT-PWR800
+power-ports:
+  - name: PSU {module}
+    type: iec-60320-c14
+    maximum_draw: 800