Add support for multiple calendars