Updated calendar model