diff --git a/device-types/AFL/FXUCXXBXXX-01BH.yaml b/device-types/AFL/FXUCXXBXXX-01BH.yaml
index 8dc15f2e6..da21366a4 100644
--- a/device-types/AFL/FXUCXXBXXX-01BH.yaml
+++ b/device-types/AFL/FXUCXXBXXX-01BH.yaml
@@ -4,6 +4,8 @@ model: U-Series Housing 1RU, 5 Cassettes
 slug: afl-fxucxxbxxx-01bh
 part_number: FXUCXXBXXX-01BH
 u_height: 1
+weight: 1.6
+weight_unit: kg
 is_full_depth: false
 is_powered: false
 module-bays:
diff --git a/device-types/AFL/FXUCXXBXXX-02BH.yaml b/device-types/AFL/FXUCXXBXXX-02BH.yaml
index 062060867..6ab2b0c46 100644
--- a/device-types/AFL/FXUCXXBXXX-02BH.yaml
+++ b/device-types/AFL/FXUCXXBXXX-02BH.yaml
@@ -4,6 +4,8 @@ model: U-Series Housing 2RU, 12 Cassettes
 slug: afl-fxucxxbxxx-02bh
 part_number: FXUCXXBXXX-02BH
 u_height: 2
+weight: 2.6
+weight_unit: kg
 is_full_depth: false
 is_powered: false
 module-bays:
diff --git a/module-types/AFL/A7UD12BPAX-01AK.yaml b/module-types/AFL/A7UD12BPAX-01AK.yaml
new file mode 100644
index 000000000..01816f4e0
--- /dev/null
+++ b/module-types/AFL/A7UD12BPAX-01AK.yaml
@@ -0,0 +1,63 @@
+---
+manufacturer: AFL
+model: A7UD12BPAX-01AK
+weight: 0.23
+weight_unit: kg
+description: 12 Fiber, SM, LC Splice Cassette
+comments: U-Series Splice Cassette, 12 Fiber, SM, LC (Blue) Loaded With Premium Easy-Strip Pigtails
+front-ports:
+  - name: '{module}:01-02'
+    type: lc
+    color: 2196f3
+    rear_port: '{module}:01-02'
+    label: 1-2
+    rear_port_position: 1
+  - name: '{module}:03-04'
+    type: lc
+    color: 2196f3
+    rear_port: '{module}:03-04'
+    label: 3-4
+    rear_port_position: 1
+  - name: '{module}:05-06'
+    type: lc
+    color: 2196f3
+    rear_port: '{module}:05-06'
+    label: 5-6
+    rear_port_position: 1
+  - name: '{module}:07-08'
+    type: lc
+    color: 2196f3
+    rear_port: '{module}:07-08'
+    label: 7-8
+    rear_port_position: 1
+  - name: '{module}:09-10'
+    type: lc
+    color: 2196f3
+    rear_port: '{module}:09-10'
+    label: 9-10
+    rear_port_position: 1
+  - name: '{module}:11-12'
+    type: lc
+    color: 2196f3
+    rear_port: '{module}:11-12'
+    label: 11-12
+    rear_port_position: 1
+rear-ports:
+  - name: '{module}:01-02'
+    type: splice
+    positions: 1
+  - name: '{module}:03-04'
+    type: splice
+    positions: 1
+  - name: '{module}:05-06'
+    type: splice
+    positions: 1
+  - name: '{module}:07-08'
+    type: splice
+    positions: 1
+  - name: '{module}:09-10'
+    type: splice
+    positions: 1
+  - name: '{module}:11-12'
+    type: splice
+    positions: 1
diff --git a/module-types/AFL/A7UD24BPAX-01AK.yaml b/module-types/AFL/A7UD24BPAX-01AK.yaml
new file mode 100644
index 000000000..e9b3709a3
--- /dev/null
+++ b/module-types/AFL/A7UD24BPAX-01AK.yaml
@@ -0,0 +1,117 @@
+---
+manufacturer: AFL
+model: A7UD24BPAX-01AK
+weight: 0.23
+weight_unit: kg
+description: 24 Fiber, SM, LC Splice Cassette
+comments: U-Series Splice Cassette, 24 Fiber, SM, LC (Blue) Loaded With Premium Easy-Strip Pigtails
+front-ports:
+  - name: '{module}:01-02'
+    type: lc
+    color: 2196f3
+    rear_port: '{module}:01-02'
+    label: 1-2
+    rear_port_position: 1
+  - name: '{module}:03-04'
+    type: lc
+    color: 2196f3
+    rear_port: '{module}:03-04'
+    label: 3-4
+    rear_port_position: 1
+  - name: '{module}:05-06'
+    type: lc
+    color: 2196f3
+    rear_port: '{module}:05-06'
+    label: 5-6
+    rear_port_position: 1
+  - name: '{module}:07-08'
+    type: lc
+    color: 2196f3
+    rear_port: '{module}:07-08'
+    label: 7-8
+    rear_port_position: 1
+  - name: '{module}:09-10'
+    type: lc
+    color: 2196f3
+    rear_port: '{module}:09-10'
+    label: 9-10
+    rear_port_position: 1
+  - name: '{module}:11-12'
+    type: lc
+    color: 2196f3
+    rear_port: '{module}:11-12'
+    label: 11-12
+    rear_port_position: 1
+  - name: '{module}:13-14'
+    type: lc
+    color: 2196f3
+    rear_port: '{module}:13-14'
+    label: 13-14
+    rear_port_position: 1
+  - name: '{module}:15-16'
+    type: lc
+    color: 2196f3
+    rear_port: '{module}:15-16'
+    label: 15-16
+    rear_port_position: 1
+  - name: '{module}:17-18'
+    type: lc
+    color: 2196f3
+    rear_port: '{module}:17-18'
+    label: 17-18
+    rear_port_position: 1
+  - name: '{module}:19-20'
+    type: lc
+    color: 2196f3
+    rear_port: '{module}:19-20'
+    label: 19-20
+    rear_port_position: 1
+  - name: '{module}:21-22'
+    type: lc
+    color: 2196f3
+    rear_port: '{module}:21-22'
+    label: 21-22
+    rear_port_position: 1
+  - name: '{module}:23-24'
+    type: lc
+    color: 2196f3
+    rear_port: '{module}:23-24'
+    label: 23-24
+    rear_port_position: 1
+rear-ports:
+  - name: '{module}:01-02'
+    type: splice
+    positions: 1
+  - name: '{module}:03-04'
+    type: splice
+    positions: 1
+  - name: '{module}:05-06'
+    type: splice
+    positions: 1
+  - name: '{module}:07-08'
+    type: splice
+    positions: 1
+  - name: '{module}:09-10'
+    type: splice
+    positions: 1
+  - name: '{module}:11-12'
+    type: splice
+    positions: 1
+  - name: '{module}:13-14'
+    type: splice
+    positions: 1
+  - name: '{module}:15-16'
+    type: splice
+    positions: 1
+  - name: '{module}:17-18'
+    type: splice
+    positions: 1
+  - name: '{module}:19-20'
+    type: splice
+    positions: 1
+  - name: '{module}:21-22'
+    type: splice
+    positions: 1
+  - name: '{module}:23-24'
+    type: splice
+    positions: 1