Add calendar and calendar_date