Rewritten CalendarService