Logging improved for CalendarService