diff --git a/device-types/Allied Telesis/GS980MX-10HSm.yaml b/device-types/Allied Telesis/GS980MX-10HSm.yaml
index 3f1e1020f5cbffa70a676e68bbcf11edd2f1152c..15b1dd8576f91b5b17297caa767b529a992d3daa 100644
--- a/device-types/Allied Telesis/GS980MX-10HSm.yaml	
+++ b/device-types/Allied Telesis/GS980MX-10HSm.yaml	
@@ -15,27 +15,43 @@ power-ports:
 interfaces:
   - name: port1.0.1
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
     mgmt_only: false
   - name: port1.0.2
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
     mgmt_only: false
   - name: port1.0.3
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
     mgmt_only: false
   - name: port1.0.4
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
     mgmt_only: false
   - name: port1.0.5
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
     mgmt_only: false
   - name: port1.0.6
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
     mgmt_only: false
   - name: port1.0.7
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
     mgmt_only: false
   - name: port1.0.8
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
     mgmt_only: false
   - name: port1.0.9
     type: 10gbase-x-sfpp
diff --git a/device-types/Allied Telesis/GS980MX-18HSm.yaml b/device-types/Allied Telesis/GS980MX-18HSm.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..96c8a50077404cec53f4dc12c7e3450b31b7d26f
--- /dev/null
+++ b/device-types/Allied Telesis/GS980MX-18HSm.yaml	
@@ -0,0 +1,101 @@
+---
+manufacturer: Allied Telesis
+model: GS980MX/18HSm
+slug: gs980mx-18hsm
+part_number: AT-GS980MX/18HSm
+u_height: 1
+is_full_depth: false
+console-ports:
+  - name: Console
+    type: rj-45
+power-ports:
+  - name: PSU 1
+    type: iec-60320-c14
+    maximum_draw: 970
+interfaces:
+  - name: port1.0.1
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.2
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.3
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.4
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.5
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.6
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.7
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.8
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.9
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.10
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.11
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.12
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.13
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.14
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.15
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.16
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.17
+    type: 10gbase-x-sfpp
+    mgmt_only: false
+  - name: port1.0.18
+    type: 10gbase-x-sfpp
+    mgmt_only: false
diff --git a/device-types/Allied Telesis/GS980MX-28PSm.yaml b/device-types/Allied Telesis/GS980MX-28PSm.yaml
index 795e0247814777be122bb1ad693c6b28b87e40d4..e7e46f51c4791094e61da95afb03c4675731c788 100644
--- a/device-types/Allied Telesis/GS980MX-28PSm.yaml	
+++ b/device-types/Allied Telesis/GS980MX-28PSm.yaml	
@@ -15,75 +15,123 @@ power-ports:
 interfaces:
   - name: port1.0.1
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.2
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.3
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.4
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.5
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.6
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.7
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.8
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.9
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.10
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.11
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.12
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.13
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.14
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.15
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.16
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.17
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.18
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.19
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.20
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.21
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.22
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.23
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.24
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.25
     type: 10gbase-x-sfpp
diff --git a/device-types/Allied Telesis/GS980MX-52PSm.yaml b/device-types/Allied Telesis/GS980MX-52PSm.yaml
index e4d7a86bd2c287bef0d36061eb0d8f0ccf44b22f..54faca2a3612ee9cebeda26e9109de21c31a46df 100644
--- a/device-types/Allied Telesis/GS980MX-52PSm.yaml	
+++ b/device-types/Allied Telesis/GS980MX-52PSm.yaml	
@@ -15,147 +15,243 @@ power-ports:
 interfaces:
   - name: port1.0.1
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.2
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.3
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.4
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.5
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.6
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.7
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.8
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.9
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.10
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.11
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.12
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.13
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.14
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.15
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.16
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.17
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.18
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.19
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.20
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.21
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.22
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.23
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.24
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.25
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.26
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.27
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.28
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.29
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.30
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.31
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.32
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.33
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.34
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.35
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.36
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.37
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.38
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.39
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.40
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.41
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.42
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.43
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.44
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.45
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.46
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.47
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.48
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.49
     type: 10gbase-x-sfpp
diff --git a/device-types/Allied Telesis/IE200-6FP.yaml b/device-types/Allied Telesis/IE200-6FP.yaml
index bbb37b5a01616d89bbcab97d5e9b3a9a65addbfc..d710fa138695211ee9d356b9b3493d75eed3ac34 100644
--- a/device-types/Allied Telesis/IE200-6FP.yaml	
+++ b/device-types/Allied Telesis/IE200-6FP.yaml	
@@ -18,15 +18,23 @@ power-ports:
 interfaces:
   - name: port1.0.1
     type: 100base-tx
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.2
     type: 100base-tx
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.3
     type: 100base-tx
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.4
     type: 100base-tx
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.5
     type: 1000base-x-sfp
diff --git a/device-types/Allied Telesis/IE200-6GP.yaml b/device-types/Allied Telesis/IE200-6GP.yaml
index 56ad21ab029fad220a6ba9f7e1f0286d19981491..9678a71ef77050b5b06356b984714324245893eb 100644
--- a/device-types/Allied Telesis/IE200-6GP.yaml	
+++ b/device-types/Allied Telesis/IE200-6GP.yaml	
@@ -18,15 +18,23 @@ power-ports:
 interfaces:
   - name: port1.0.1
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.2
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.3
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.4
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.5
     type: 1000base-x-sfp
diff --git a/device-types/Allied Telesis/IE300-12GP.yaml b/device-types/Allied Telesis/IE300-12GP.yaml
index b3cb13ba465bb5e680dcebe532f63f0822fe617d..80957b76ee39f4a4a0952f48a9845c5a52831015 100644
--- a/device-types/Allied Telesis/IE300-12GP.yaml	
+++ b/device-types/Allied Telesis/IE300-12GP.yaml	
@@ -18,27 +18,43 @@ power-ports:
 interfaces:
   - name: port1.0.1
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.2
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.3
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.4
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.5
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.6
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.7
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.8
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.9
     type: 1000base-x-sfp
diff --git a/device-types/Allied Telesis/IE340-12GP.yaml b/device-types/Allied Telesis/IE340-12GP.yaml
index 813224bc70efbf88eb9231d9ec68ce61de74824a..b5b0830aa86063899d96976ed95e557db352bdf1 100644
--- a/device-types/Allied Telesis/IE340-12GP.yaml	
+++ b/device-types/Allied Telesis/IE340-12GP.yaml	
@@ -18,27 +18,43 @@ power-ports:
 interfaces:
   - name: port1.0.1
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.2
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.3
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.4
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.5
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.6
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.7
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.8
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.9
     type: 1000base-x-sfp
diff --git a/device-types/Allied Telesis/IE340-20GP.yaml b/device-types/Allied Telesis/IE340-20GP.yaml
index 7fef6cad6ade797e9a1b48e7ca53837cee36d878..868b0420852096dda57d8d5872970891902ff57d 100644
--- a/device-types/Allied Telesis/IE340-20GP.yaml	
+++ b/device-types/Allied Telesis/IE340-20GP.yaml	
@@ -18,51 +18,83 @@ power-ports:
 interfaces:
   - name: port1.0.1
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.2
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.3
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.4
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.5
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.6
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.7
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.8
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.9
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.10
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.11
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.12
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.13
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.14
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.15
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.16
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.17
     type: 1000base-x-sfp
diff --git a/device-types/Allied Telesis/IE340-18GP.yaml b/device-types/Allied Telesis/IE340L-18GP.yaml
similarity index 61%
rename from device-types/Allied Telesis/IE340-18GP.yaml
rename to device-types/Allied Telesis/IE340L-18GP.yaml
index acf1d096c0124abee880edc384f6c03e776c0fb3..560f6c5a2470df098ac263ac9379c72ca9263910 100644
--- a/device-types/Allied Telesis/IE340-18GP.yaml	
+++ b/device-types/Allied Telesis/IE340L-18GP.yaml	
@@ -1,8 +1,8 @@
 ---
 manufacturer: Allied Telesis
-model: IE340-18GP
-slug: ie340-18GP
-part_number: AT-IE340-18GP
+model: IE340L-18GP
+slug: ie340l-18gp
+part_number: AT-IE340L-18GP
 u_height: 0
 is_full_depth: false
 console-ports:
@@ -18,51 +18,83 @@ power-ports:
 interfaces:
   - name: port1.0.1
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.2
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.3
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.4
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.5
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.6
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.7
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.8
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.9
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.10
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.11
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.12
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.13
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.14
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.15
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.16
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.17
     type: 1000base-x-sfp
diff --git a/device-types/Allied Telesis/x230-10GP.yaml b/device-types/Allied Telesis/x230-10GP.yaml
index 03fbcd72c2fda309655f80e8e83af30ab9de933c..0ccf5bd5571f29dfea845fd0bd5880bed2df6daf 100644
--- a/device-types/Allied Telesis/x230-10GP.yaml	
+++ b/device-types/Allied Telesis/x230-10GP.yaml	
@@ -15,27 +15,43 @@ power-ports:
 interfaces:
   - name: port1.0.1
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.2
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.3
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.4
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.5
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.6
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.7
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.8
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.9
     type: 1000base-x-sfp
diff --git a/device-types/Allied Telesis/x230-18GP.yaml b/device-types/Allied Telesis/x230-18GP.yaml
index eb6df2f01ea3b077f660d7b3ab60d6a7cce5abdd..77072a4461b64e2266a68ed0e2b7d59cb552ef77 100644
--- a/device-types/Allied Telesis/x230-18GP.yaml	
+++ b/device-types/Allied Telesis/x230-18GP.yaml	
@@ -15,51 +15,83 @@ power-ports:
 interfaces:
   - name: port1.0.1
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.2
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.3
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.4
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.5
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.6
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.7
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.8
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.9
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.10
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.11
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.12
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.13
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.14
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.15
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.16
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.17
     type: 1000base-x-sfp
diff --git a/device-types/Allied Telesis/x230-28GP.yaml b/device-types/Allied Telesis/x230-28GP.yaml
index b4cd41723b957104918fdbfc8c882f13e454322d..5b0348aaa804b6c66945810f577569a47d682e68 100644
--- a/device-types/Allied Telesis/x230-28GP.yaml	
+++ b/device-types/Allied Telesis/x230-28GP.yaml	
@@ -15,75 +15,123 @@ power-ports:
 interfaces:
   - name: port1.0.1
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.2
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.3
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.4
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.5
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.6
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.7
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.8
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.9
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.10
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.11
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.12
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.13
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.14
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.15
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.16
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.17
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.18
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.19
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.20
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.21
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.22
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.23
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.24
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.25
     type: 1000base-x-sfp
diff --git a/device-types/Allied Telesis/x510-28GPX.yaml b/device-types/Allied Telesis/x510-28GPX.yaml
index 3aa72fadca3409ec282841f55e48e4556a53aa09..ebd533259c68fd2174583bb0f1082dc6ca882666 100644
--- a/device-types/Allied Telesis/x510-28GPX.yaml	
+++ b/device-types/Allied Telesis/x510-28GPX.yaml	
@@ -18,75 +18,123 @@ power-ports:
 interfaces:
   - name: port1.0.1
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.2
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.3
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.4
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.5
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.6
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.7
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.8
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.9
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.10
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.11
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.12
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.13
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.14
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.15
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.16
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.17
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.18
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.19
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.20
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.21
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.22
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.23
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.24
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.25
     type: 10gbase-x-sfpp
diff --git a/device-types/Allied Telesis/x510-52GPX.yaml b/device-types/Allied Telesis/x510-52GPX.yaml
index 5f889504c8989b5b26b5b21f3ee01096a63b3304..1d98877d364eff78ddbf5d3a6f6774daeaded258 100644
--- a/device-types/Allied Telesis/x510-52GPX.yaml	
+++ b/device-types/Allied Telesis/x510-52GPX.yaml	
@@ -18,147 +18,243 @@ power-ports:
 interfaces:
   - name: port1.0.1
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.2
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.3
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.4
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.5
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.6
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.7
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.8
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.9
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.10
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.11
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.12
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.13
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.14
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.15
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.16
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.17
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.18
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.19
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.20
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.21
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.22
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.23
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.24
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.25
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.26
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.27
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.28
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.29
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.30
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.31
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.32
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.33
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.34
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.35
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.36
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.37
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.38
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.39
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.40
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.41
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.42
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.43
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.44
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.45
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.46
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.47
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.48
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.49
     type: 10gbase-x-sfpp
diff --git a/device-types/Allied Telesis/x510L-28GP.yaml b/device-types/Allied Telesis/x510L-28GP.yaml
index 932606e4b7652624dee50f1de64f37c460c67013..f7ef3a87f985362ea056cf0e33fdc39eb4d2d993 100644
--- a/device-types/Allied Telesis/x510L-28GP.yaml	
+++ b/device-types/Allied Telesis/x510L-28GP.yaml	
@@ -15,75 +15,123 @@ power-ports:
 interfaces:
   - name: port1.0.1
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.2
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.3
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.4
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.5
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.6
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.7
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.8
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.9
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.10
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.11
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.12
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.13
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.14
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.15
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.16
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.17
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.18
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.19
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.20
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.21
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.22
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.23
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.24
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.25
     type: 10gbase-x-sfpp
diff --git a/device-types/Allied Telesis/x510L-52GP.yaml b/device-types/Allied Telesis/x510L-52GP.yaml
index f38fc08e4303fea139eb1616d2204550c9e65c32..4fe634a75b734100373c6c4c98042fceb40a6636 100644
--- a/device-types/Allied Telesis/x510L-52GP.yaml	
+++ b/device-types/Allied Telesis/x510L-52GP.yaml	
@@ -15,147 +15,243 @@ power-ports:
 interfaces:
   - name: port1.0.1
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.2
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.3
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.4
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.5
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.6
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.7
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.8
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.9
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.10
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.11
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.12
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.13
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.14
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.15
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.16
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.17
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.18
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.19
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.20
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.21
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.22
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.23
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.24
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.25
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.26
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.27
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.28
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.29
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.30
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.31
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.32
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.33
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.34
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.35
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.36
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.37
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.38
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.39
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.40
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.41
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.42
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.43
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.44
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.45
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.46
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.47
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.48
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.49
     type: 10gbase-x-sfpp
diff --git a/device-types/Allied Telesis/x530-10GHXm.yaml b/device-types/Allied Telesis/x530-10GHXm.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..11af805518d8090a74e86fc53c5053131f01b127
--- /dev/null
+++ b/device-types/Allied Telesis/x530-10GHXm.yaml	
@@ -0,0 +1,64 @@
+---
+manufacturer: Allied Telesis
+model: x530-10GHXm
+slug: x530-10ghxm
+part_number: AT-x530-10GHXm
+u_height: 1
+is_full_depth: false
+console-ports:
+  - name: Console
+    type: rj-45
+power-ports:
+  - name: PSU 1
+    type: iec-60320-c14
+    maximum_draw: 485
+  - name: PSU 2
+    type: iec-60320-c14
+    maximum_draw: 485
+interfaces:
+  - name: port1.0.1
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.2
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.3
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.4
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.5
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.6
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.7
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.8
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.9
+    type: 10gbase-x-sfpp
+    mgmt_only: false
+  - name: port1.0.10
+    type: 10gbase-x-sfpp
+    mgmt_only: false
diff --git a/device-types/Allied Telesis/x530-18GHXm.yaml b/device-types/Allied Telesis/x530-18GHXm.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..400441e0bfb9216395b7b8874f1971eb059d0439
--- /dev/null
+++ b/device-types/Allied Telesis/x530-18GHXm.yaml	
@@ -0,0 +1,104 @@
+---
+manufacturer: Allied Telesis
+model: x530-18GHXm
+slug: x530-18ghxm
+part_number: AT-x530-18GHXm
+u_height: 1
+is_full_depth: false
+console-ports:
+  - name: Console
+    type: rj-45
+power-ports:
+  - name: PSU 1
+    type: iec-60320-c14
+    maximum_draw: 700
+  - name: PSU 2
+    type: iec-60320-c14
+    maximum_draw: 700
+interfaces:
+  - name: port1.0.1
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.2
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.3
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.4
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.5
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.6
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.7
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.8
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.9
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.10
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.11
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.12
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.13
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.14
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.15
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.16
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.17
+    type: 10gbase-x-sfpp
+    mgmt_only: false
+  - name: port1.0.18
+    type: 10gbase-x-sfpp
+    mgmt_only: false
diff --git a/device-types/Allied Telesis/x530-28GPXm.yaml b/device-types/Allied Telesis/x530-28GPXm.yaml
index d4ad681200ab6bf0c1046933e1d4ee469d9d1da2..a820a4a2f52810f271c85dd6ba319fd540e9c008 100644
--- a/device-types/Allied Telesis/x530-28GPXm.yaml	
+++ b/device-types/Allied Telesis/x530-28GPXm.yaml	
@@ -18,75 +18,123 @@ power-ports:
 interfaces:
   - name: port1.0.1
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.2
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.3
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.4
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.5
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.6
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.7
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.8
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.9
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.10
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.11
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.12
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.13
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.14
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.15
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.16
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.17
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.18
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.19
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.20
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.21
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.22
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.23
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.24
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.25
     type: 10gbase-x-sfpp
diff --git a/device-types/Allied Telesis/x530-52GPXm.yaml b/device-types/Allied Telesis/x530-52GPXm.yaml
index 87826268eee7a165ef0b60aaba8ee89c1d6beb7a..38f777b91b12e43f27558b785c29a8c628827146 100644
--- a/device-types/Allied Telesis/x530-52GPXm.yaml	
+++ b/device-types/Allied Telesis/x530-52GPXm.yaml	
@@ -18,147 +18,243 @@ power-ports:
 interfaces:
   - name: port1.0.1
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.2
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.3
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.4
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.5
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.6
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.7
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.8
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.9
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.10
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.11
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.12
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.13
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.14
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.15
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.16
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.17
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.18
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.19
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.20
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.21
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.22
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.23
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.24
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.25
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.26
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.27
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.28
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.29
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.30
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.31
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.32
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.33
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.34
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.35
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.36
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.37
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.38
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.39
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.40
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.41
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.42
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.43
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.44
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.45
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.46
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.47
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.48
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.49
     type: 10gbase-x-sfpp
diff --git a/device-types/Allied Telesis/x530DP-28GHXm.yaml b/device-types/Allied Telesis/x530DP-28GHXm.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..2a5eea83cb4ef7f0319f14d96db126910bad0e10
--- /dev/null
+++ b/device-types/Allied Telesis/x530DP-28GHXm.yaml	
@@ -0,0 +1,152 @@
+---
+manufacturer: Allied Telesis
+model: x530DP-28GHXm
+slug: x530dp-28ghxm
+part_number: AT-x530DP-28GHXm
+u_height: 1
+is_full_depth: false
+console-ports:
+  - name: Console
+    type: rj-45
+interfaces:
+  - name: port1.0.1
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.2
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.3
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.4
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.5
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.6
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.7
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.8
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.9
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.10
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.11
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.12
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.13
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.14
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.15
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.16
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.17
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.18
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.19
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.20
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.21
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.22
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.23
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.24
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.25
+    type: 10gbase-x-sfpp
+    mgmt_only: false
+  - name: port1.0.26
+    type: 10gbase-x-sfpp
+    mgmt_only: false
+  - name: port1.0.27
+    type: 10gbase-x-sfpp
+    mgmt_only: false
+  - name: port1.0.28
+    type: 10gbase-x-sfpp
+    mgmt_only: false
+module-bays:
+  - name: PSU A
+    position: 'A'
+  - name: PSU B
+    position: 'B'
+inventory-items:
+  - name: Fan-Module
+    manufacturer: Allied Telesis
+    part_id: AT-FAN10
diff --git a/device-types/Allied Telesis/x530DP-52GHXm.yaml b/device-types/Allied Telesis/x530DP-52GHXm.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..c21d5c8f13420661481dacdcd12a5c9f6171b00b
--- /dev/null
+++ b/device-types/Allied Telesis/x530DP-52GHXm.yaml	
@@ -0,0 +1,272 @@
+---
+manufacturer: Allied Telesis
+model: x530DP-52GHXm
+slug: x530dp-52ghxm
+part_number: AT-x530DP-52GHXm
+u_height: 1
+is_full_depth: false
+console-ports:
+  - name: Console
+    type: rj-45
+interfaces:
+  - name: port1.0.1
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+    mgmt_only: false
+  - name: port1.0.2
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+    mgmt_only: false
+  - name: port1.0.3
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+    mgmt_only: false
+  - name: port1.0.4
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+    mgmt_only: false
+  - name: port1.0.5
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+    mgmt_only: false
+  - name: port1.0.6
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+    mgmt_only: false
+  - name: port1.0.7
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+    mgmt_only: false
+  - name: port1.0.8
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+    mgmt_only: false
+  - name: port1.0.9
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+    mgmt_only: false
+  - name: port1.0.10
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+    mgmt_only: false
+  - name: port1.0.11
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+    mgmt_only: false
+  - name: port1.0.12
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+    mgmt_only: false
+  - name: port1.0.13
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+    mgmt_only: false
+  - name: port1.0.14
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+    mgmt_only: false
+  - name: port1.0.15
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+    mgmt_only: false
+  - name: port1.0.16
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+    mgmt_only: false
+  - name: port1.0.17
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+    mgmt_only: false
+  - name: port1.0.18
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+    mgmt_only: false
+  - name: port1.0.19
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+    mgmt_only: false
+  - name: port1.0.20
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+    mgmt_only: false
+  - name: port1.0.21
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+    mgmt_only: false
+  - name: port1.0.22
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+    mgmt_only: false
+  - name: port1.0.23
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+    mgmt_only: false
+  - name: port1.0.24
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+    mgmt_only: false
+  - name: port1.0.25
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.26
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.27
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.28
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.29
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.30
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.31
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.32
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.33
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.34
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.35
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.36
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.37
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.38
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.39
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.40
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.41
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.42
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.43
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.44
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.45
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.46
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.47
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.48
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type3-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.49
+    type: 10gbase-x-sfpp
+    mgmt_only: false
+  - name: port1.0.50
+    type: 10gbase-x-sfpp
+    mgmt_only: false
+  - name: port1.0.51
+    type: 10gbase-x-sfpp
+    mgmt_only: false
+  - name: port1.0.52
+    type: 10gbase-x-sfpp
+    mgmt_only: false
+module-bays:
+  - name: PSU A
+    position: 'A'
+  - name: PSU B
+    position: 'B'
+inventory-items:
+  - name: Fan-Module
+    manufacturer: Allied Telesis
+    part_id: AT-FAN10
diff --git a/device-types/Allied Telesis/x530L-10GHXm.yaml b/device-types/Allied Telesis/x530L-10GHXm.yaml
index 51054fe9c61dade18bb0b6046212c205d8a826d3..8e68168ba9ec2a96217156b865be73a72ef1731c 100644
--- a/device-types/Allied Telesis/x530L-10GHXm.yaml	
+++ b/device-types/Allied Telesis/x530L-10GHXm.yaml	
@@ -11,31 +11,47 @@ console-ports:
 power-ports:
   - name: PSU 1
     type: iec-60320-c14
-    maximum_draw: 500
+    maximum_draw: 605
 interfaces:
   - name: port1.0.1
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
     mgmt_only: false
   - name: port1.0.2
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
     mgmt_only: false
   - name: port1.0.3
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
     mgmt_only: false
   - name: port1.0.4
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
     mgmt_only: false
   - name: port1.0.5
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
     mgmt_only: false
   - name: port1.0.6
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
     mgmt_only: false
   - name: port1.0.7
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
     mgmt_only: false
   - name: port1.0.8
     type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
     mgmt_only: false
   - name: port1.0.9
     type: 10gbase-x-sfpp
diff --git a/device-types/Allied Telesis/x530L-18GHXm.yaml b/device-types/Allied Telesis/x530L-18GHXm.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..2a1403e66a74cbe4d04f715e969e1b877bd8f1ec
--- /dev/null
+++ b/device-types/Allied Telesis/x530L-18GHXm.yaml	
@@ -0,0 +1,101 @@
+---
+manufacturer: Allied Telesis
+model: x530L-18GHXm
+slug: x530l-18ghxm
+part_number: AT-x530L-18GHXm
+u_height: 1
+is_full_depth: false
+console-ports:
+  - name: Console
+    type: rj-45
+power-ports:
+  - name: PSU 1
+    type: iec-60320-c14
+    maximum_draw: 970
+interfaces:
+  - name: port1.0.1
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.2
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.3
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.4
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.5
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.6
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.7
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.8
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.9
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.10
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.11
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.12
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.13
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.14
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.15
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.16
+    type: 5gbase-t
+    poe_mode: pse
+    poe_type: type4-ieee802.3bt
+    mgmt_only: false
+  - name: port1.0.17
+    type: 10gbase-x-sfpp
+    mgmt_only: false
+  - name: port1.0.18
+    type: 10gbase-x-sfpp
+    mgmt_only: false
diff --git a/device-types/Allied Telesis/x530L-28GPX.yaml b/device-types/Allied Telesis/x530L-28GPX.yaml
index 6b8545aef8980585e1bf3b85b59c9dae706e809e..781c5d2aa8f91c12cba8fc19dc93451b5bf424d2 100644
--- a/device-types/Allied Telesis/x530L-28GPX.yaml	
+++ b/device-types/Allied Telesis/x530L-28GPX.yaml	
@@ -18,75 +18,123 @@ power-ports:
 interfaces:
   - name: port1.0.1
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.2
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.3
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.4
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.5
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.6
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.7
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.8
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.9
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.10
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.11
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.12
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.13
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.14
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.15
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.16
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.17
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.18
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.19
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.20
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.21
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.22
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.23
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.24
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.25
     type: 10gbase-x-sfpp
diff --git a/device-types/Allied Telesis/x530L-52GPX.yaml b/device-types/Allied Telesis/x530L-52GPX.yaml
index 3a3af3db43789adf5694886d1332c7b70ff93913..512c9e3519073229f16a2cd7f5f3b565aeecf037 100644
--- a/device-types/Allied Telesis/x530L-52GPX.yaml	
+++ b/device-types/Allied Telesis/x530L-52GPX.yaml	
@@ -18,147 +18,243 @@ power-ports:
 interfaces:
   - name: port1.0.1
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.2
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.3
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.4
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.5
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.6
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.7
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.8
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.9
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.10
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.11
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.12
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.13
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.14
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.15
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.16
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.17
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.18
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.19
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.20
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.21
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.22
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.23
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.24
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.25
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.26
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.27
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.28
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.29
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.30
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.31
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.32
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.33
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.34
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.35
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.36
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.37
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.38
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.39
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.40
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.41
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.42
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.43
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.44
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.45
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.46
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.47
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.48
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.49
     type: 10gbase-x-sfpp
diff --git a/device-types/Allied Telesis/x930-28GPX.yaml b/device-types/Allied Telesis/x930-28GPX.yaml
index e8e9347c57053c400c9bb12a6aaa3e4d61d03555..796eac7e26973de064f558e8a26aabb945e59dab 100644
--- a/device-types/Allied Telesis/x930-28GPX.yaml	
+++ b/device-types/Allied Telesis/x930-28GPX.yaml	
@@ -11,75 +11,123 @@ console-ports:
 interfaces:
   - name: port1.0.1
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.2
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.3
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.4
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.5
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.6
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.7
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.8
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.9
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.10
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.11
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.12
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.13
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.14
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.15
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.16
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.17
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.18
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.19
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.20
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.21
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.22
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.23
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.24
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.25
     type: 10gbase-x-sfpp
diff --git a/device-types/Allied Telesis/x930-52GPX.yaml b/device-types/Allied Telesis/x930-52GPX.yaml
index 33b88056b4a1df84ee03581a81b4a7ef2ae17830..c277f98deef6cb9f748255be62a0aaa2e68439cf 100644
--- a/device-types/Allied Telesis/x930-52GPX.yaml	
+++ b/device-types/Allied Telesis/x930-52GPX.yaml	
@@ -11,147 +11,243 @@ console-ports:
 interfaces:
   - name: port1.0.1
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.2
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.3
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.4
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.5
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.6
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.7
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.8
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.9
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.10
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.11
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.12
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.13
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.14
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.15
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.16
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.17
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.18
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.19
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.20
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.21
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.22
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.23
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.24
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.25
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.26
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.27
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.28
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.29
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.30
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.31
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.32
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.33
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.34
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.35
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.36
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.37
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.38
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.39
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.40
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.41
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.42
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.43
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.44
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.45
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.46
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.47
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.48
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
     mgmt_only: false
   - name: port1.0.49
     type: 10gbase-x-sfpp
diff --git a/module-types/Allied Telesis/SBx81GP24.yaml b/module-types/Allied Telesis/SBx81GP24.yaml
index 7c6008860c494608bf7b490af0a673f321329dea..940506e86b2cf0887053ff878dc520db453be3d5 100644
--- a/module-types/Allied Telesis/SBx81GP24.yaml	
+++ b/module-types/Allied Telesis/SBx81GP24.yaml	
@@ -5,49 +5,97 @@ part_number: AT-SBx81GP24
 interfaces:
   - name: port1.{module}.1
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port1.{module}.2
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port1.{module}.3
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port1.{module}.4
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port1.{module}.5
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port1.{module}.6
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port1.{module}.7
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port1.{module}.8
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port1.{module}.9
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port1.{module}.10
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port1.{module}.11
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port1.{module}.12
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port1.{module}.13
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port1.{module}.14
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port1.{module}.15
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port1.{module}.16
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port1.{module}.17
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port1.{module}.18
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port1.{module}.19
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port1.{module}.20
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port1.{module}.21
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port1.{module}.22
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port1.{module}.23
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port1.{module}.24
     type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at