CalendarModel optimized a bit