Removed dependency on vih_calendar