Better handling of multiple calendars