diff --git a/device-types/Cisco/ASR1002-HX.yaml b/device-types/Cisco/ASR1002-HX.yaml
index 7d298273a..7a46efa4f 100644
--- a/device-types/Cisco/ASR1002-HX.yaml
+++ b/device-types/Cisco/ASR1002-HX.yaml
@@ -13,6 +13,16 @@ power-ports:
     type: iec-60320-c14
   - name: P1
     type: iec-60320-c14
+module-bays:
+  - name: ASR1002-HX-EPA
+    label: EPA
+    position: 0/2
+  - name: ASR1002-HX-NIM
+    label: NIM
+    position: '1'
+  - name: ASR1002-HX-CRYPTO
+    label: CRYPTO
+    position: '0'
 interfaces:
   - name: GigabitEthernet0/0/0
     type: 1000base-x-sfp
diff --git a/module-types/Cisco/ASR1001HX-IPSECHW.yaml b/module-types/Cisco/ASR1001HX-IPSECHW.yaml
new file mode 100644
index 000000000..7c18f6467
--- /dev/null
+++ b/module-types/Cisco/ASR1001HX-IPSECHW.yaml
@@ -0,0 +1,6 @@
+---
+manufacturer: Cisco
+model: ASR1001HX-IPSECHW
+part_number: ASR1001HX-IPSECHW
+comments: Cisco ASR1001-HX crypto module with no default crypto throughput. You can upgrade the throughput (8 Gbps or 16 Gbps) by applying a software-activated
+  performance upgrade license
diff --git a/module-types/Cisco/ASR1002HX-IPSECHW.yaml b/module-types/Cisco/ASR1002HX-IPSECHW.yaml
new file mode 100644
index 000000000..61af6ef5d
--- /dev/null
+++ b/module-types/Cisco/ASR1002HX-IPSECHW.yaml
@@ -0,0 +1,6 @@
+---
+manufacturer: Cisco
+model: ASR1002HX-IPSECHW
+part_number: ASR1002HX-IPSECHW
+comments: Cisco ASR1002-HX crypto module with no default crypto throughput. You can upgrade the throughput (8 Gbps, 16 Gbps, or 25 Gbps) by applying a software-activated
+  performance upgrade license
diff --git a/module-types/Cisco/EPA-10X10GE.yaml b/module-types/Cisco/EPA-10X10GE.yaml
new file mode 100644
index 000000000..9cb195b9c
--- /dev/null
+++ b/module-types/Cisco/EPA-10X10GE.yaml
@@ -0,0 +1,21 @@
+---
+manufacturer: Cisco
+model: EPA-10X10GE
+part_number: EPA-10X10GE
+interfaces:
+  - name: TenGigabitEthernet{module}/0
+    type: 10gbase-x-sfpp
+  - name: TenGigabitEthernet{module}/1
+    type: 10gbase-x-sfpp
+  - name: TenGigabitEthernet{module}/2
+    type: 10gbase-x-sfpp
+  - name: TenGigabitEthernet{module}/3
+    type: 10gbase-x-sfpp
+  - name: TenGigabitEthernet{module}/4
+    type: 10gbase-x-sfpp
+  - name: TenGigabitEthernet{module}/5
+    type: 10gbase-x-sfpp
+  - name: TenGigabitEthernet{module}/6
+    type: 10gbase-x-sfpp
+  - name: TenGigabitEthernet{module}/7
+    type: 10gbase-x-sfpp
diff --git a/module-types/Cisco/EPA-18X1GE.yaml b/module-types/Cisco/EPA-18X1GE.yaml
new file mode 100644
index 000000000..40c67ca67
--- /dev/null
+++ b/module-types/Cisco/EPA-18X1GE.yaml
@@ -0,0 +1,41 @@
+---
+manufacturer: Cisco
+model: EPA-18X1GE
+part_number: EPA-18X1GE
+interfaces:
+  - name: GigabitEthernet{module}/0
+    type: 1000base-x-sfp
+  - name: GigabitEthernet{module}/1
+    type: 1000base-x-sfp
+  - name: GigabitEthernet{module}/2
+    type: 1000base-x-sfp
+  - name: GigabitEthernet{module}/3
+    type: 1000base-x-sfp
+  - name: GigabitEthernet{module}/4
+    type: 1000base-x-sfp
+  - name: GigabitEthernet{module}/5
+    type: 1000base-x-sfp
+  - name: GigabitEthernet{module}/6
+    type: 1000base-x-sfp
+  - name: GigabitEthernet{module}/7
+    type: 1000base-x-sfp
+  - name: GigabitEthernet{module}/8
+    type: 1000base-x-sfp
+  - name: GigabitEthernet{module}/9
+    type: 1000base-x-sfp
+  - name: GigabitEthernet{module}/10
+    type: 1000base-x-sfp
+  - name: GigabitEthernet{module}/11
+    type: 1000base-x-sfp
+  - name: GigabitEthernet{module}/12
+    type: 1000base-x-sfp
+  - name: GigabitEthernet{module}/13
+    type: 1000base-x-sfp
+  - name: GigabitEthernet{module}/14
+    type: 1000base-x-sfp
+  - name: GigabitEthernet{module}/15
+    type: 1000base-x-sfp
+  - name: GigabitEthernet{module}/16
+    type: 1000base-x-sfp
+  - name: GigabitEthernet{module}/17
+    type: 1000base-x-sfp
diff --git a/module-types/Cisco/EPA-1X100GE.yaml b/module-types/Cisco/EPA-1X100GE.yaml
new file mode 100644
index 000000000..48918c7c7
--- /dev/null
+++ b/module-types/Cisco/EPA-1X100GE.yaml
@@ -0,0 +1,7 @@
+---
+manufacturer: Cisco
+model: EPA-1X100GE
+part_number: EPA-1X100GE
+interfaces:
+  - name: HundredGigE{module}/0
+    type: 100gbase-x-qsfp28