diff --git a/MVMCoreUI/OtherHandlers/CoreUIModelMapping.swift b/MVMCoreUI/OtherHandlers/CoreUIModelMapping.swift
index dbaefc49..68494d90 100644
--- a/MVMCoreUI/OtherHandlers/CoreUIModelMapping.swift
+++ b/MVMCoreUI/OtherHandlers/CoreUIModelMapping.swift
@@ -41,6 +41,7 @@ open class CoreUIModelMapping: ModelMapping {
         ModelRegistry.register(handler: ButtonGroup.self, for: ButtonGroupModel.self)
 
         // MARK:- Entry Field
+        ModelRegistry.register(handler: DatePickerEntryField.self, for: DatePickerEntryFieldModel.self)
         ModelRegistry.register(handler: InputEntryField.self, for: TextEntryFieldModel.self)
         ModelRegistry.register(handler: MdnEntryField.self, for: MdnEntryFieldModel.self)
         ModelRegistry.register(handler: DigitEntryField.self, for: DigitEntryFieldModel.self)
@@ -62,6 +63,7 @@ open class CoreUIModelMapping: ModelMapping {
         ModelRegistry.register(handler: Star.self, for: StarModel.self)
         
         // MARK:- Other Atoms
+        ModelRegistry.register(handler: CalendarView.self, for: CalendarViewModel.self)
         ModelRegistry.register(handler: ProgressBar.self, for: ProgressBarModel.self)
         ModelRegistry.register(handler: MultiProgress.self, for: MultiProgressBarModel.self)
         ModelRegistry.register(handler: CaretView.self, for: CaretViewModel.self)