Add CalendarEvent and use it for unified Calendar modules