Adding CalendarWrapper