diff --git a/device-types/APC/AP8868.yaml b/device-types/APC/AP8868.yaml
new file mode 100644
index 00000000..34d5b9f0
--- /dev/null
+++ b/device-types/APC/AP8868.yaml
@@ -0,0 +1,184 @@
+manufacturer: APC
+model: AP8868
+slug: ap8868
+# comments: Rack PDU 2G, Metered, ZeroU, 10.0kW, 208V, (36) C13 & (6) C19
+u_height: 0
+console-ports:
+  - name: Serial
+    type: rj-12
+power-ports:
+  - name: Power Port 1
+    type: cs8365c
+power-outlets:
+  - name: Bank1-C13-1
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank1-C13-2
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank1-C13-3
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank1-C13-4
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank1-C13-5
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank1-C13-6
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank1-C13-7
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank1-C13-8
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank1-C13-9
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank1-C13-10
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank1-C13-11
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank1-C13-12
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank1-C19-1
+    type: iec-60320-c19
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank1-C19-2
+    type: iec-60320-c19
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank2-C13-1
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank2-C13-2
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank2-C13-3
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank2-C13-4
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank2-C13-5
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank2-C13-6
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank2-C13-7
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank2-C13-8
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank2-C13-9
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank2-C13-10
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank2-C13-11
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank2-C13-12
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank2-C19-1
+    type: iec-60320-c19
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank2-C19-2
+    type: iec-60320-c19
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank3-C13-1
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank3-C13-2
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank3-C13-3
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank3-C13-4
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank3-C13-5
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank3-C13-6
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank3-C13-7
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank3-C13-8
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank3-C13-9
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank3-C13-10
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank3-C13-11
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank4-C13-12
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank3-C19-1
+    type: iec-60320-c19
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank3-C19-2
+    type: iec-60320-c19
+    power_port: Power Port 1
+    feed_leg: A
+interfaces:
+  - name: Network
+    type: 100base-tx
+    mgmt_only: true
diff --git a/device-types/APC/AP8886.yaml b/device-types/APC/AP8886.yaml
new file mode 100644
index 00000000..739b9d1a
--- /dev/null
+++ b/device-types/APC/AP8886.yaml
@@ -0,0 +1,184 @@
+manufacturer: APC
+model: AP8886
+slug: ap8886
+# comments: Rack PDU 2G, Metered, ZeroU, 22.0kW(32A) 17.3kW(24A), 230V, (30) C13 & (12) C19
+u_height: 0
+console-ports:
+  - name: Serial
+    type: rj-12
+power-ports:
+  - name: Power Port 1
+    type: iec-60309-3p-n-e-9h
+power-outlets:
+  - name: Bank1-C13-1
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank1-C13-2
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank1-C13-3
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank1-C13-4
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank1-C13-5
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank1-C13-6
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank1-C13-7
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank1-C13-8
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank1-C13-9
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank1-C13-10
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank1-C19-1
+    type: iec-60320-c19
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank1-C19-2
+    type: iec-60320-c19
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank1-C19-3
+    type: iec-60320-c19
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank1-C19-4
+    type: iec-60320-c19
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank2-C13-1
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank2-C13-2
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank2-C13-3
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank2-C13-4
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank2-C13-5
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank2-C13-6
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank2-C13-7
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank2-C13-8
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank2-C13-9
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank2-C13-10
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank2-C19-1
+    type: iec-60320-c19
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank2-C19-2
+    type: iec-60320-c19
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank2-C19-3
+    type: iec-60320-c19
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank2-C19-4
+    type: iec-60320-c19
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank3-C13-1
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank3-C13-2
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank3-C13-3
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank3-C13-4
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank3-C13-5
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank3-C13-6
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank3-C13-7
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank3-C13-8
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank3-C13-9
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank3-C13-10
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank3-C19-1
+    type: iec-60320-c19
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank3-C19-2
+    type: iec-60320-c19
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank3-C19-3
+    type: iec-60320-c19
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank3-C19-4
+    type: iec-60320-c19
+    power_port: Power Port 1
+    feed_leg: A
+interfaces:
+  - name: Network
+    type: 100base-tx
+    mgmt_only: true
diff --git a/device-types/APC/AP8932.yaml b/device-types/APC/AP8932.yaml
new file mode 100644
index 00000000..84dbe769
--- /dev/null
+++ b/device-types/APC/AP8932.yaml
@@ -0,0 +1,116 @@
+manufacturer: APC
+model: AP8932
+slug: ap8932
+# comments: Rack PDU 2G, Switched, ZeroU, 30A, 100-120V, (24) 5-20R
+u_height: 0
+console-ports:
+  - name: Serial
+    type: rj-12
+power-ports:
+  - name: Power Port 1
+    type: nema-l5-30p
+power-outlets:
+  - name: Power Outlet 1
+    type: nema-5-20r
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Power Outlet 2
+    type: nema-5-20r
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Power Outlet 3
+    type: nema-5-20r
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Power Outlet 4
+    type: nema-5-20r
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Power Outlet 5
+    type: nema-5-20r
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Power Outlet 6
+    type: nema-5-20r
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Power Outlet 7
+    type: nema-5-20r
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Power Outlet 8
+    type: nema-5-20r
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Power Outlet 9
+    type: nema-5-20r
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Power Outlet 10
+    type: nema-5-20r
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Power Outlet 11
+    type: nema-5-20r
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Power Outlet 12
+    type: nema-5-20r
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Power Outlet 13
+    type: nema-5-20r
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Power Outlet 14
+    type: nema-5-20r
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Power Outlet 15
+    type: nema-5-20r
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Power Outlet 16
+    type: nema-5-20r
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Power Outlet 17
+    type: nema-5-20r
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Power Outlet 18
+    type: nema-5-20r
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Power Outlet 19
+    type: nema-5-20r
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Power Outlet 20
+    type: nema-5-20r
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Power Outlet 20
+    type: nema-5-20r
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Power Outlet 21
+    type: nema-5-20r
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Power Outlet 22
+    type: nema-5-20r
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Power Outlet 23
+    type: nema-5-20r
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Power Outlet 24
+    type: nema-5-20r
+    power_port: Power Port 1
+    feed_leg: A
+interfaces:
+  - name: Network
+    type: 100base-tx
+    mgmt_only: true
diff --git a/tests/schema.json b/tests/schema.json
index b33c4f57..f649a051 100644
--- a/tests/schema.json
+++ b/tests/schema.json
@@ -92,6 +92,7 @@
                     "enum": [
                         "de-9",
                         "db-25",
+                        "rj-12",
                         "rj-45",
                         "usb-a",
                         "usb-b",
@@ -118,6 +119,7 @@
                     "enum": [
                         "de-9",
                         "db-25",
+                        "rj-12",
                         "rj-45",
                         "usb-a",
                         "usb-b",
@@ -185,7 +187,19 @@
                         "ita-l",
                         "ita-m",
                         "ita-n",
-                        "ita-o"
+                        "ita-o",
+                        "cs6360c",
+                        "cs6361c",
+                        "cs6364c",
+                        "cs6365c",
+                        "cs8164c",
+                        "cs8165c",
+                        "cs8264c",
+                        "cs8265c",
+                        "cs8364c",
+                        "cs8365c",
+                        "cs8464c",
+                        "cs8465c"
                     ]
                 },
                 "maximum_draw": {
@@ -249,7 +263,19 @@
                         "ita-l",
                         "ita-m",
                         "ita-n",
-                        "ita-o"
+                        "ita-o",
+                        "cs6360c",
+                        "cs6361c",
+                        "cs6364c",
+                        "cs6365c",
+                        "cs8164c",
+                        "cs8165c",
+                        "cs8264c",
+                        "cs8265c",
+                        "cs8364c",
+                        "cs8365c",
+                        "cs8464c",
+                        "cs8465c"
                     ]
                 },
                 "power_port": {