Updated calendar support