diff --git a/MVMCoreUI/OtherHandlers/CoreUIModelMapping.swift b/MVMCoreUI/OtherHandlers/CoreUIModelMapping.swift
index c45936cf..dbaefc49 100644
--- a/MVMCoreUI/OtherHandlers/CoreUIModelMapping.swift
+++ b/MVMCoreUI/OtherHandlers/CoreUIModelMapping.swift
@@ -50,8 +50,10 @@ open class CoreUIModelMapping: ModelMapping {
         
         // MARK:- Selectors
         ModelRegistry.register(handler: RadioButton.self, for: RadioButtonModel.self)
+        ModelRegistry.register(handler: RadioButtons.self, for: RadioButtonsModel.self)
         ModelRegistry.register(handler: RadioBoxes.self, for: RadioBoxesModel.self)
         ModelRegistry.register(handler: Checkbox.self, for: CheckboxModel.self)
+        ModelRegistry.register(handler: Checkboxes.self, for: CheckboxesModel.self)
         ModelRegistry.register(handler: RadioSwatches.self, for: RadioSwatchesModel.self)
         ModelRegistry.register(handler: Tags.self, for: TagsModel.self)
         ModelRegistry.register(handler: Tag.self, for: TagModel.self)