Adapte to Calendars new interface