Updated calendar parsing