diff --git a/data/registers/syscfg_f3.yaml b/data/registers/syscfg_f3.yaml
index b96db5b..5b31ae6 100644
--- a/data/registers/syscfg_f3.yaml
+++ b/data/registers/syscfg_f3.yaml
@@ -10,21 +10,12 @@ block/SYSCFG:
     fieldset: RCR
     name: RCR
   - byte_offset: 8
-    description: external interrupt configuration register 1
-    fieldset: EXTICR1
-    name: EXTICR1
-  - byte_offset: 12
-    description: external interrupt configuration register 2
-    fieldset: EXTICR2
-    name: EXTICR2
-  - byte_offset: 16
-    description: external interrupt configuration register 3
-    fieldset: EXTICR3
-    name: EXTICR3
-  - byte_offset: 20
-    description: external interrupt configuration register 4
-    fieldset: EXTICR4
-    name: EXTICR4
+    description: external interrupt configuration register
+    fieldset: EXTICR
+    name: EXTICR
+    array:
+      len: 4
+      stride: 4
   - byte_offset: 24
     description: configuration register 2
     fieldset: CFGR2
@@ -1210,98 +1201,16 @@ fieldset/CFGR4:
     description: Controls the Input trigger of ADC34 injected channel JEXT14
     enum: ADC34_JEXT14_RMP
     name: ADC34_JEXT14_RMP
-fieldset/EXTICR1:
-  description: external interrupt configuration register 1
+fieldset/EXTICR:
+  description: external interrupt configuration register
   fields:
   - bit_offset: 0
     bit_size: 4
-    description: EXTI 0 configuration bits
-    enum: EXTI0
-    name: EXTI0
-  - bit_offset: 4
-    bit_size: 4
-    description: EXTI 1 configuration bits
-    enum: EXTI1
-    name: EXTI1
-  - bit_offset: 8
-    bit_size: 4
-    description: EXTI 2 configuration bits
-    enum: EXTI2
-    name: EXTI2
-  - bit_offset: 12
-    bit_size: 4
-    description: EXTI 3 configuration bits
-    enum: EXTI3
-    name: EXTI3
-fieldset/EXTICR2:
-  description: external interrupt configuration register 2
-  fields:
-  - bit_offset: 0
-    bit_size: 4
-    description: EXTI 4 configuration bits
-    enum: EXTI4
-    name: EXTI4
-  - bit_offset: 4
-    bit_size: 4
-    description: EXTI 5 configuration bits
-    enum: EXTI5
-    name: EXTI5
-  - bit_offset: 8
-    bit_size: 4
-    description: EXTI 6 configuration bits
-    enum: EXTI6
-    name: EXTI6
-  - bit_offset: 12
-    bit_size: 4
-    description: EXTI 7 configuration bits
-    enum: EXTI7
-    name: EXTI7
-fieldset/EXTICR3:
-  description: external interrupt configuration register 3
-  fields:
-  - bit_offset: 0
-    bit_size: 4
-    description: EXTI 8 configuration bits
-    enum: EXTI8
-    name: EXTI8
-  - bit_offset: 4
-    bit_size: 4
-    description: EXTI 9 configuration bits
-    enum: EXTI9
-    name: EXTI9
-  - bit_offset: 8
-    bit_size: 4
-    description: EXTI 10 configuration bits
-    enum: EXTI10
-    name: EXTI10
-  - bit_offset: 12
-    bit_size: 4
-    description: EXTI 11 configuration bits
-    enum: EXTI11
-    name: EXTI11
-fieldset/EXTICR4:
-  description: external interrupt configuration register 4
-  fields:
-  - bit_offset: 0
-    bit_size: 4
-    description: EXTI 12 configuration bits
-    enum: EXTI12
-    name: EXTI12
-  - bit_offset: 4
-    bit_size: 4
-    description: EXTI 13 configuration bits
-    enum: EXTI13
-    name: EXTI13
-  - bit_offset: 8
-    bit_size: 4
-    description: EXTI 14 configuration bits
-    enum: EXTI14
-    name: EXTI14
-  - bit_offset: 12
-    bit_size: 4
-    description: EXTI 15 configuration bits
-    enum: EXTI15
-    name: EXTI15
+    description: EXTI x configuration
+    name: EXTI
+    array:
+      len: 4
+      stride: 4
 fieldset/RCR:
   description: CCM SRAM protection register
   fields: