diff --git a/data/registers/tim1ch_v2.yaml b/data/registers/tim1ch_v2.yaml
deleted file mode 100644
index 8be4617..0000000
--- a/data/registers/tim1ch_v2.yaml
+++ /dev/null
@@ -1,422 +0,0 @@
-block/TIM_1CH:
-  description: 1-channel timers
-  items:
-  - name: CR1
-    description: control register 1
-    byte_offset: 0
-    fieldset: CR1_1CH
-  - name: DIER
-    description: DMA/Interrupt enable register
-    byte_offset: 12
-    fieldset: DIER_1CH
-  - name: SR
-    description: status register
-    byte_offset: 16
-    fieldset: SR_1CH
-  - name: EGR
-    description: event generation register
-    byte_offset: 20
-    access: Write
-    fieldset: EGR_1CH
-  - name: CCMR_Input
-    description: capture/compare mode register 1 (input mode)
-    array:
-      len: 1
-      stride: 4
-    byte_offset: 24
-    fieldset: CCMR_Input_1CH
-  - name: CCMR_Output
-    description: capture/compare mode register 1 (output mode)
-    array:
-      len: 1
-      stride: 4
-    byte_offset: 24
-    fieldset: CCMR_Output_1CH
-  - name: CCER
-    description: capture/compare enable register
-    byte_offset: 32
-    fieldset: CCER_1CH
-  - name: CNT
-    description: counter
-    byte_offset: 36
-    fieldset: CNT_1CH
-  - name: PSC
-    description: prescaler
-    byte_offset: 40
-    fieldset: PSC_1CH
-  - name: ARR
-    description: auto-reload register (Dither mode disabled)
-    byte_offset: 44
-    fieldset: ARR_1CH
-  - name: ARR_DITHER
-    description: auto-reload register (Dither mode enabled)
-    byte_offset: 44
-    fieldset: ARR_DITHER_1CH
-  - name: CCR
-    description: capture/compare register x (x=1) (Dither mode disabled)
-    array:
-      len: 1
-      stride: 4
-    byte_offset: 52
-    fieldset: CCR_1CH
-  - name: CCR_DITHER
-    description: capture/compare register x (x=1) (Dither mode enabled)
-    array:
-      len: 1
-      stride: 4
-    byte_offset: 52
-    fieldset: CCR_DITHER_1CH
-  - name: TISEL
-    description: input selection register
-    byte_offset: 92
-    fieldset: TISEL_1CH
-fieldset/ARR_1CH:
-  description: auto-reload register (Dither mode disabled)
-  fields:
-  - name: ARR
-    description: Auto-reload value
-    bit_offset: 0
-    bit_size: 16
-fieldset/ARR_DITHER_1CH:
-  description: auto-reload register (Dither mode enabled)
-  fields:
-  - name: DITHER
-    description: Dither value
-    bit_offset: 0
-    bit_size: 4
-  - name: ARR
-    description: Auto-reload value
-    bit_offset: 4
-    bit_size: 16
-fieldset/CCER_1CH:
-  description: capture/compare enable register
-  fields:
-  - name: CCE
-    description: Capture/Compare x (x=1) output enable
-    bit_offset: 0
-    bit_size: 1
-    array:
-      len: 1
-      stride: 4
-  - name: CCP
-    description: Capture/Compare x (x=1) output Polarity
-    bit_offset: 1
-    bit_size: 1
-    array:
-      len: 1
-      stride: 4
-  - name: CCNP
-    description: Capture/Compare x (x=1) output Polarity
-    bit_offset: 3
-    bit_size: 1
-    array:
-      len: 1
-      stride: 4
-fieldset/CCMR_Input_1CH:
-  description: capture/compare mode register x (x=1) (input mode)
-  fields:
-  - name: CCS
-    description: Capture/Compare y selection
-    bit_offset: 0
-    bit_size: 2
-    array:
-      len: 1
-      stride: 8
-    enum: CCMR_Input_CCS
-  - name: ICPSC
-    description: Input capture y prescaler
-    bit_offset: 2
-    bit_size: 2
-    array:
-      len: 1
-      stride: 8
-  - name: ICF
-    description: Input capture y filter
-    bit_offset: 4
-    bit_size: 4
-    array:
-      len: 1
-      stride: 8
-    enum: FilterValue
-fieldset/CCMR_Output_1CH:
-  description: capture/compare mode register x (x=1) (output mode)
-  fields:
-  - name: CCS
-    description: Capture/Compare y selection
-    bit_offset: 0
-    bit_size: 2
-    array:
-      len: 1
-      stride: 8
-    enum: CCMR_Output_CCS
-  - name: OCFE
-    description: Output compare y fast enable
-    bit_offset: 2
-    bit_size: 1
-    array:
-      len: 1
-      stride: 8
-  - name: OCPE
-    description: Output compare y preload enable
-    bit_offset: 3
-    bit_size: 1
-    array:
-      len: 1
-      stride: 8
-  - name: OCM
-    description: Output compare y mode
-    bit_offset: 4
-    bit_size: 3
-    array:
-      len: 1
-      stride: 8
-    enum: OCM
-fieldset/CCR_1CH:
-  description: capture/compare register x (x=1) (Dither mode disabled)
-  fields:
-  - name: CCR
-    description: capture/compare x (x=1) value
-    bit_offset: 0
-    bit_size: 16
-fieldset/CCR_DITHER_1CH:
-  description: capture/compare register x (x=1) (Dither mode enabled)
-  fields:
-  - name: DITHER
-    description: Dither value
-    bit_offset: 0
-    bit_size: 4
-  - name: CCR
-    description: capture/compare x (x=1) value
-    bit_offset: 4
-    bit_size: 16
-fieldset/CNT_1CH:
-  description: counter
-  fields:
-  - name: CNT
-    description: counter value
-    bit_offset: 0
-    bit_size: 16
-  - name: UIFCPY
-    description: UIF copy
-    bit_offset: 31
-    bit_size: 1
-fieldset/CR1_1CH:
-  description: control register 1
-  fields:
-  - name: CEN
-    description: Counter enable
-    bit_offset: 0
-    bit_size: 1
-  - name: UDIS
-    description: Update disable
-    bit_offset: 1
-    bit_size: 1
-  - name: URS
-    description: Update request source
-    bit_offset: 2
-    bit_size: 1
-    enum: URS
-  - name: OPM
-    description: One-pulse mode enbaled
-    bit_offset: 3
-    bit_size: 1
-  - name: ARPE
-    description: Auto-reload preload enable
-    bit_offset: 7
-    bit_size: 1
-  - name: CKD
-    description: Clock division
-    bit_offset: 8
-    bit_size: 2
-    enum: CKD
-  - name: UIFREMAP
-    description: UIF status bit remapping enable
-    bit_offset: 11
-    bit_size: 1
-  - name: DITHEN
-    description: Dithering enable
-    bit_offset: 12
-    bit_size: 1
-fieldset/DIER_1CH:
-  description: DMA/Interrupt enable register
-  fields:
-  - name: UIE
-    description: Update interrupt enable
-    bit_offset: 0
-    bit_size: 1
-  - name: CCIE
-    description: Capture/Compare x (x=1) interrupt enable
-    bit_offset: 1
-    bit_size: 1
-    array:
-      len: 1
-      stride: 1
-fieldset/EGR_1CH:
-  description: event generation register
-  fields:
-  - name: UG
-    description: Update generation
-    bit_offset: 0
-    bit_size: 1
-  - name: CCG
-    description: Capture/compare x (x=1) generation
-    bit_offset: 1
-    bit_size: 1
-    array:
-      len: 1
-      stride: 1
-fieldset/PSC_1CH:
-  description: prescaler
-  fields:
-  - name: PSC
-    description: Prescaler value
-    bit_offset: 0
-    bit_size: 16
-fieldset/SR_1CH:
-  description: status register
-  fields:
-  - name: UIF
-    description: Update interrupt flag
-    bit_offset: 0
-    bit_size: 1
-  - name: CCIF
-    description: Capture/compare x (x=1) interrupt flag
-    bit_offset: 1
-    bit_size: 1
-    array:
-      len: 1
-      stride: 1
-  - name: CCOF
-    description: Capture/Compare x (x=1) overcapture flag
-    bit_offset: 9
-    bit_size: 1
-    array:
-      len: 1
-      stride: 1
-fieldset/TISEL_1CH:
-  description: input selection register
-  fields:
-  - name: TISEL
-    description: Selects TIM_TIx (x=1) input
-    bit_offset: 0
-    bit_size: 4
-    array:
-      len: 1
-      stride: 8
-enum/CCMR_Input_CCS:
-  bit_size: 2
-  variants:
-  - name: TI4
-    description: 'CCx channel is configured as input, normal mapping: ICx mapped to TIx'
-    value: 1
-  - name: TI3
-    description: CCx channel is configured as input, alternate mapping (switches 1 with 2, 3 with 4)
-    value: 2
-  - name: TRC
-    description: CCx channel is configured as input, ICx is mapped on TRC
-    value: 3
-enum/CCMR_Output_CCS:
-  bit_size: 2
-  variants:
-  - name: Output
-    description: CCx channel is configured as output
-    value: 0
-enum/CKD:
-  bit_size: 2
-  variants:
-  - name: Div1
-    description: t_DTS = t_CK_INT
-    value: 0
-  - name: Div2
-    description: t_DTS = 2 × t_CK_INT
-    value: 1
-  - name: Div4
-    description: t_DTS = 4 × t_CK_INT
-    value: 2
-enum/FilterValue:
-  bit_size: 4
-  variants:
-  - name: NoFilter
-    description: No filter, sampling is done at fDTS
-    value: 0
-  - name: FCK_INT_N2
-    description: fSAMPLING=fCK_INT, N=2
-    value: 1
-  - name: FCK_INT_N4
-    description: fSAMPLING=fCK_INT, N=4
-    value: 2
-  - name: FCK_INT_N8
-    description: fSAMPLING=fCK_INT, N=8
-    value: 3
-  - name: FDTS_Div2_N6
-    description: fSAMPLING=fDTS/2, N=6
-    value: 4
-  - name: FDTS_Div2_N8
-    description: fSAMPLING=fDTS/2, N=8
-    value: 5
-  - name: FDTS_Div4_N6
-    description: fSAMPLING=fDTS/4, N=6
-    value: 6
-  - name: FDTS_Div4_N8
-    description: fSAMPLING=fDTS/4, N=8
-    value: 7
-  - name: FDTS_Div8_N6
-    description: fSAMPLING=fDTS/8, N=6
-    value: 8
-  - name: FDTS_Div8_N8
-    description: fSAMPLING=fDTS/8, N=8
-    value: 9
-  - name: FDTS_Div16_N5
-    description: fSAMPLING=fDTS/16, N=5
-    value: 10
-  - name: FDTS_Div16_N6
-    description: fSAMPLING=fDTS/16, N=6
-    value: 11
-  - name: FDTS_Div16_N8
-    description: fSAMPLING=fDTS/16, N=8
-    value: 12
-  - name: FDTS_Div32_N5
-    description: fSAMPLING=fDTS/32, N=5
-    value: 13
-  - name: FDTS_Div32_N6
-    description: fSAMPLING=fDTS/32, N=6
-    value: 14
-  - name: FDTS_Div32_N8
-    description: fSAMPLING=fDTS/32, N=8
-    value: 15
-enum/OCM:
-  bit_size: 3
-  variants:
-  - name: Frozen
-    description: The comparison between the output compare register TIMx_CCRy and the counter TIMx_CNT has no effect on the outputs
-    value: 0
-  - name: ActiveOnMatch
-    description: Set channel to active level on match. OCyREF signal is forced high when the counter matches the capture/compare register
-    value: 1
-  - name: InactiveOnMatch
-    description: Set channel to inactive level on match. OCyREF signal is forced low when the counter matches the capture/compare register
-    value: 2
-  - name: Toggle
-    description: OCyREF toggles when TIMx_CNT=TIMx_CCRy
-    value: 3
-  - name: ForceInactive
-    description: OCyREF is forced low
-    value: 4
-  - name: ForceActive
-    description: OCyREF is forced high
-    value: 5
-  - name: PwmMode1
-    description: In upcounting, channel is active as long as TIMx_CNT<TIMx_CCRy else inactive. In downcounting, channel is inactive as long as TIMx_CNT>TIMx_CCRy else active
-    value: 6
-  - name: PwmMode2
-    description: Inversely to PwmMode1
-    value: 7
-enum/URS:
-  bit_size: 1
-  variants:
-  - name: AnyEvent
-    description: Any of counter overflow/underflow, setting UG, or update through slave mode, generates an update interrupt or DMA request
-    value: 0
-  - name: CounterOnly
-    description: Only counter overflow/underflow generates an update interrupt or DMA request
-    value: 1
diff --git a/data/registers/tim1chcmp_v2.yaml b/data/registers/tim1chcmp_v2.yaml
index e3e8743..e963e29 100644
--- a/data/registers/tim1chcmp_v2.yaml
+++ b/data/registers/tim1chcmp_v2.yaml
@@ -1,10 +1,312 @@
-block/TIM_1CH_CMP:
-  description: 1-channel with one complementary output timers
+block/TIM_1CH:
+  description: 1-channel timers
   items:
   - name: CR1
     description: control register 1
     byte_offset: 0
-    fieldset: CR1_1CH_CMP
+    fieldset: CR1_1CH
+  - name: DIER
+    description: DMA/Interrupt enable register
+    byte_offset: 12
+    fieldset: DIER_1CH
+  - name: SR
+    description: status register
+    byte_offset: 16
+    fieldset: SR_1CH
+  - name: EGR
+    description: event generation register
+    byte_offset: 20
+    access: Write
+    fieldset: EGR_1CH
+  - name: CCMR_Input
+    description: capture/compare mode register 1 (input mode)
+    array:
+      len: 1
+      stride: 4
+    byte_offset: 24
+    fieldset: CCMR_Input_1CH
+  - name: CCMR_Output
+    description: capture/compare mode register 1 (output mode)
+    array:
+      len: 1
+      stride: 4
+    byte_offset: 24
+    fieldset: CCMR_Output_1CH
+  - name: CCER
+    description: capture/compare enable register
+    byte_offset: 32
+    fieldset: CCER_1CH
+  - name: CNT
+    description: counter
+    byte_offset: 36
+    fieldset: CNT_1CH
+  - name: PSC
+    description: prescaler
+    byte_offset: 40
+    fieldset: PSC_1CH
+  - name: ARR
+    description: auto-reload register (Dither mode disabled)
+    byte_offset: 44
+    fieldset: ARR_1CH
+  - name: ARR_DITHER
+    description: auto-reload register (Dither mode enabled)
+    byte_offset: 44
+    fieldset: ARR_DITHER_1CH
+  - name: CCR
+    description: capture/compare register x (x=1) (Dither mode disabled)
+    array:
+      len: 1
+      stride: 4
+    byte_offset: 52
+    fieldset: CCR_1CH
+  - name: CCR_DITHER
+    description: capture/compare register x (x=1) (Dither mode enabled)
+    array:
+      len: 1
+      stride: 4
+    byte_offset: 52
+    fieldset: CCR_DITHER_1CH
+  - name: TISEL
+    description: input selection register
+    byte_offset: 92
+    fieldset: TISEL_1CH
+fieldset/ARR_1CH:
+  description: auto-reload register (Dither mode disabled)
+  fields:
+  - name: ARR
+    description: Auto-reload value
+    bit_offset: 0
+    bit_size: 16
+fieldset/ARR_DITHER_1CH:
+  description: auto-reload register (Dither mode enabled)
+  fields:
+  - name: DITHER
+    description: Dither value
+    bit_offset: 0
+    bit_size: 4
+  - name: ARR
+    description: Auto-reload value
+    bit_offset: 4
+    bit_size: 16
+fieldset/CCER_1CH:
+  description: capture/compare enable register
+  fields:
+  - name: CCE
+    description: Capture/Compare x (x=1) output enable
+    bit_offset: 0
+    bit_size: 1
+    array:
+      len: 1
+      stride: 4
+  - name: CCP
+    description: Capture/Compare x (x=1) output Polarity
+    bit_offset: 1
+    bit_size: 1
+    array:
+      len: 1
+      stride: 4
+  - name: CCNP
+    description: Capture/Compare x (x=1) output Polarity
+    bit_offset: 3
+    bit_size: 1
+    array:
+      len: 1
+      stride: 4
+fieldset/CCMR_Input_1CH:
+  description: capture/compare mode register x (x=1) (input mode)
+  fields:
+  - name: CCS
+    description: Capture/Compare y selection
+    bit_offset: 0
+    bit_size: 2
+    array:
+      len: 1
+      stride: 8
+    enum: CCMR_Input_CCS
+  - name: ICPSC
+    description: Input capture y prescaler
+    bit_offset: 2
+    bit_size: 2
+    array:
+      len: 1
+      stride: 8
+  - name: ICF
+    description: Input capture y filter
+    bit_offset: 4
+    bit_size: 4
+    array:
+      len: 1
+      stride: 8
+    enum: FilterValue
+fieldset/CCMR_Output_1CH:
+  description: capture/compare mode register x (x=1) (output mode)
+  fields:
+  - name: CCS
+    description: Capture/Compare y selection
+    bit_offset: 0
+    bit_size: 2
+    array:
+      len: 1
+      stride: 8
+    enum: CCMR_Output_CCS
+  - name: OCFE
+    description: Output compare y fast enable
+    bit_offset: 2
+    bit_size: 1
+    array:
+      len: 1
+      stride: 8
+  - name: OCPE
+    description: Output compare y preload enable
+    bit_offset: 3
+    bit_size: 1
+    array:
+      len: 1
+      stride: 8
+  - name: OCM
+    description: Output compare y mode
+    bit_offset: 4
+    bit_size: 3
+    array:
+      len: 1
+      stride: 8
+    enum: OCM
+fieldset/CCR_1CH:
+  description: capture/compare register x (x=1) (Dither mode disabled)
+  fields:
+  - name: CCR
+    description: capture/compare x (x=1) value
+    bit_offset: 0
+    bit_size: 16
+fieldset/CCR_DITHER_1CH:
+  description: capture/compare register x (x=1) (Dither mode enabled)
+  fields:
+  - name: DITHER
+    description: Dither value
+    bit_offset: 0
+    bit_size: 4
+  - name: CCR
+    description: capture/compare x (x=1) value
+    bit_offset: 4
+    bit_size: 16
+fieldset/CNT_1CH:
+  description: counter
+  fields:
+  - name: CNT
+    description: counter value
+    bit_offset: 0
+    bit_size: 16
+  - name: UIFCPY
+    description: UIF copy
+    bit_offset: 31
+    bit_size: 1
+fieldset/CR1_1CH:
+  description: control register 1
+  fields:
+  - name: CEN
+    description: Counter enable
+    bit_offset: 0
+    bit_size: 1
+  - name: UDIS
+    description: Update disable
+    bit_offset: 1
+    bit_size: 1
+  - name: URS
+    description: Update request source
+    bit_offset: 2
+    bit_size: 1
+    enum: URS
+  - name: OPM
+    description: One-pulse mode enbaled
+    bit_offset: 3
+    bit_size: 1
+  - name: ARPE
+    description: Auto-reload preload enable
+    bit_offset: 7
+    bit_size: 1
+  - name: CKD
+    description: Clock division
+    bit_offset: 8
+    bit_size: 2
+    enum: CKD
+  - name: UIFREMAP
+    description: UIF status bit remapping enable
+    bit_offset: 11
+    bit_size: 1
+  - name: DITHEN
+    description: Dithering enable
+    bit_offset: 12
+    bit_size: 1
+fieldset/DIER_1CH:
+  description: DMA/Interrupt enable register
+  fields:
+  - name: UIE
+    description: Update interrupt enable
+    bit_offset: 0
+    bit_size: 1
+  - name: CCIE
+    description: Capture/Compare x (x=1) interrupt enable
+    bit_offset: 1
+    bit_size: 1
+    array:
+      len: 1
+      stride: 1
+fieldset/EGR_1CH:
+  description: event generation register
+  fields:
+  - name: UG
+    description: Update generation
+    bit_offset: 0
+    bit_size: 1
+  - name: CCG
+    description: Capture/compare x (x=1) generation
+    bit_offset: 1
+    bit_size: 1
+    array:
+      len: 1
+      stride: 1
+fieldset/PSC_1CH:
+  description: prescaler
+  fields:
+  - name: PSC
+    description: Prescaler value
+    bit_offset: 0
+    bit_size: 16
+fieldset/SR_1CH:
+  description: status register
+  fields:
+  - name: UIF
+    description: Update interrupt flag
+    bit_offset: 0
+    bit_size: 1
+  - name: CCIF
+    description: Capture/compare x (x=1) interrupt flag
+    bit_offset: 1
+    bit_size: 1
+    array:
+      len: 1
+      stride: 1
+  - name: CCOF
+    description: Capture/Compare x (x=1) overcapture flag
+    bit_offset: 9
+    bit_size: 1
+    array:
+      len: 1
+      stride: 1
+fieldset/TISEL_1CH:
+  description: input selection register
+  fields:
+  - name: TISEL
+    description: Selects TIM_TIx (x=1) input
+    bit_offset: 0
+    bit_size: 4
+    array:
+      len: 1
+      stride: 8
+block/TIM_1CH_CMP:
+  extends: TIM_1CH
+  description: 1-channel with one complementary output timers
+  items:
   - name: CR2
     description: control register 2
     byte_offset: 4
@@ -22,51 +324,14 @@ block/TIM_1CH_CMP:
     byte_offset: 20
     access: Write
     fieldset: EGR_1CH_CMP
-  - name: CCMR_Input
-    description: capture/compare mode register 1 (input mode)
-    array:
-      len: 1
-      stride: 4
-    byte_offset: 24
-    fieldset: CCMR_Input_1CH_CMP
-  - name: CCMR_Output
-    description: capture/compare mode register 1 (output mode)
-    array:
-      len: 1
-      stride: 4
-    byte_offset: 24
-    fieldset: CCMR_Output_1CH_CMP
   - name: CCER
     description: capture/compare enable register
     byte_offset: 32
     fieldset: CCER_1CH_CMP
-  - name: CNT
-    description: counter
-    byte_offset: 36
-    fieldset: CNT_1CH_CMP
-  - name: PSC
-    description: prescaler
-    byte_offset: 40
-    fieldset: PSC_1CH_CMP
-  - name: ARR
-    description: auto-reload register (Dither mode disabled)
-    byte_offset: 44
-    fieldset: ARR_1CH_CMP
-  - name: ARR_DITHER
-    description: auto-reload register (Dither mode enabled)
-    byte_offset: 44
-    fieldset: ARR_DITHER_1CH_CMP
   - name: RCR
     description: repetition counter register
     byte_offset: 48
     fieldset: RCR_1CH_CMP
-  - name: CCR
-    description: capture/compare register x (x=1) (Dither mode disabled)
-    array:
-      len: 1
-      stride: 4
-    byte_offset: 52
-    fieldset: CCR_1CH_CMP
   - name: CCR_DITHER
     description: capture/compare register x (x=1) (Dither mode enabled)
     array:
@@ -82,10 +347,6 @@ block/TIM_1CH_CMP:
     description: break and dead-time register
     byte_offset: 84
     fieldset: DTR2_1CH_CMP
-  - name: TISEL
-    description: input selection register
-    byte_offset: 92
-    fieldset: TISEL_1CH_CMP
   - name: AF1
     description: alternate function register 1
     byte_offset: 96
@@ -136,24 +397,6 @@ fieldset/AF2_1CH_CMP:
     description: ocref_clr source selection
     bit_offset: 16
     bit_size: 3
-fieldset/ARR_1CH_CMP:
-  description: auto-reload register (Dither mode disabled)
-  fields:
-  - name: ARR
-    description: Auto-reload value
-    bit_offset: 0
-    bit_size: 16
-fieldset/ARR_DITHER_1CH_CMP:
-  description: auto-reload register (Dither mode enabled)
-  fields:
-  - name: DITHER
-    description: Dither value
-    bit_offset: 0
-    bit_size: 4
-  - name: ARR
-    description: Auto-reload value
-    bit_offset: 4
-    bit_size: 16
 fieldset/BDTR_1CH_CMP:
   description: break and dead-time register
   fields:
@@ -224,6 +467,7 @@ fieldset/BDTR_1CH_CMP:
       stride: 1
     enum: BKBID
 fieldset/CCER_1CH_CMP:
+  extends: CCER_1CH
   description: capture/compare enable register
   fields:
   - name: CCE
@@ -240,13 +484,6 @@ fieldset/CCER_1CH_CMP:
     array:
       len: 1
       stride: 4
-  - name: CCNE
-    description: Capture/Compare x (x=1) complementary output enable
-    bit_offset: 2
-    bit_size: 1
-    array:
-      len: 1
-      stride: 4
   - name: CCNP
     description: Capture/Compare x (x=1) output Polarity
     bit_offset: 3
@@ -254,79 +491,6 @@ fieldset/CCER_1CH_CMP:
     array:
       len: 1
       stride: 4
-fieldset/CCMR_Input_1CH_CMP:
-  description: capture/compare mode register x (x=1) (input mode)
-  fields:
-  - name: CCS
-    description: Capture/Compare y selection
-    bit_offset: 0
-    bit_size: 2
-    array:
-      len: 1
-      stride: 8
-    enum: CCMR_Input_CCS
-  - name: ICPSC
-    description: Input capture y prescaler
-    bit_offset: 2
-    bit_size: 2
-    array:
-      len: 1
-      stride: 8
-  - name: ICF
-    description: Input capture y filter
-    bit_offset: 4
-    bit_size: 4
-    array:
-      len: 1
-      stride: 8
-    enum: FilterValue
-fieldset/CCMR_Output_1CH_CMP:
-  description: capture/compare mode register x (x=1) (output mode)
-  fields:
-  - name: CCS
-    description: Capture/Compare y selection
-    bit_offset: 0
-    bit_size: 2
-    array:
-      len: 1
-      stride: 8
-    enum: CCMR_Output_CCS
-  - name: OCFE
-    description: Output compare y fast enable
-    bit_offset: 2
-    bit_size: 1
-    array:
-      len: 1
-      stride: 8
-  - name: OCPE
-    description: Output compare y preload enable
-    bit_offset: 3
-    bit_size: 1
-    array:
-      len: 1
-      stride: 8
-  - name: OCM
-    description: Output compare y mode
-    bit_offset: 4
-    bit_size: 3
-    array:
-      len: 1
-      stride: 8
-    enum: OCM
-  - name: OCCE
-    description: Output compare y clear enable
-    bit_offset: 7
-    bit_size: 1
-    array:
-      len: 1
-      stride: 8
-fieldset/CCR_1CH_CMP:
-  description: capture/compare register x (x=1) (Dither mode disabled)
-  fields:
-  - name: CCR
-    description: capture/compare x (x=1) value
-    bit_offset: 0
-    bit_size: 16
 fieldset/CCR_DITHER_1CH_CMP:
   description: capture/compare register x (x=1) (Dither mode enabled)
   fields:
@@ -338,54 +502,6 @@ fieldset/CCR_DITHER_1CH_CMP:
     description: capture/compare x (x=1) value
     bit_offset: 4
     bit_size: 16
-fieldset/CNT_1CH_CMP:
-  description: counter
-  fields:
-  - name: CNT
-    description: counter value
-    bit_offset: 0
-    bit_size: 16
-  - name: UIFCPY
-    description: UIF copy
-    bit_offset: 31
-    bit_size: 1
-fieldset/CR1_1CH_CMP:
-  description: control register 1
-  fields:
-  - name: CEN
-    description: Counter enable
-    bit_offset: 0
-    bit_size: 1
-  - name: UDIS
-    description: Update disable
-    bit_offset: 1
-    bit_size: 1
-  - name: URS
-    description: Update request source
-    bit_offset: 2
-    bit_size: 1
-    enum: URS
-  - name: OPM
-    description: One-pulse mode enbaled
-    bit_offset: 3
-    bit_size: 1
-  - name: ARPE
-    description: Auto-reload preload enable
-    bit_offset: 7
-    bit_size: 1
-  - name: CKD
-    description: Clock division
-    bit_offset: 8
-    bit_size: 2
-    enum: CKD
-  - name: UIFREMAP
-    description: UIF status bit remapping enable
-    bit_offset: 11
-    bit_size: 1
-  - name: DITHEN
-    description: Dithering enable
-    bit_offset: 12
-    bit_size: 1
 fieldset/CR2_1CH_CMP:
   description: control register 2
   fields:
@@ -433,19 +549,9 @@ fieldset/DCR_1CH_CMP:
     bit_size: 4
     enum: DBSS
 fieldset/DIER_1CH_CMP:
+  extends: DIER_1CH
   description: DMA/Interrupt enable register
   fields:
-  - name: UIE
-    description: Update interrupt enable
-    bit_offset: 0
-    bit_size: 1
-  - name: CCIE
-    description: Capture/Compare x (x=1-2) interrupt enable
-    bit_offset: 1
-    bit_size: 1
-    array:
-      len: 2
-      stride: 1
   - name: COMIE
     description: COM interrupt enable
     bit_offset: 5
@@ -489,19 +595,9 @@ fieldset/DTR2_1CH_CMP:
     bit_offset: 17
     bit_size: 1
 fieldset/EGR_1CH_CMP:
+  extends: EGR_1CH
   description: event generation register
   fields:
-  - name: UG
-    description: Update generation
-    bit_offset: 0
-    bit_size: 1
-  - name: CCG
-    description: Capture/compare x (x=1) generation
-    bit_offset: 1
-    bit_size: 1
-    array:
-      len: 1
-      stride: 1
   - name: COMG
     description: Capture/Compare control update generation
     bit_offset: 5
@@ -513,13 +609,6 @@ fieldset/EGR_1CH_CMP:
     array:
       len: 1
       stride: 1
-fieldset/PSC_1CH_CMP:
-  description: prescaler
-  fields:
-  - name: PSC
-    description: Prescaler value
-    bit_offset: 0
-    bit_size: 16
 fieldset/RCR_1CH_CMP:
   description: repetition counter register
   fields:
@@ -528,19 +617,9 @@ fieldset/RCR_1CH_CMP:
     bit_offset: 0
     bit_size: 8
 fieldset/SR_1CH_CMP:
+  extends: SR_1CH
   description: status register
   fields:
-  - name: UIF
-    description: Update interrupt flag
-    bit_offset: 0
-    bit_size: 1
-  - name: CCIF
-    description: Capture/compare x (x=1) interrupt flag
-    bit_offset: 1
-    bit_size: 1
-    array:
-      len: 1
-      stride: 1
   - name: COMIF
     description: COM interrupt flag
     bit_offset: 5
@@ -552,23 +631,6 @@ fieldset/SR_1CH_CMP:
     array:
       len: 1
       stride: 1
-  - name: CCOF
-    description: Capture/Compare x (x=1) overcapture flag
-    bit_offset: 9
-    bit_size: 1
-    array:
-      len: 1
-      stride: 1
-fieldset/TISEL_1CH_CMP:
-  description: input selection register
-  fields:
-  - name: TISEL
-    description: Selects TIM_TIx (x=1) input
-    bit_offset: 0
-    bit_size: 4
-    array:
-      len: 1
-      stride: 8
 enum/BKBID:
   bit_size: 1
   variants: