Removed vih_calendar dependency