Add support for calendars (not using mcal!)