Added more calendar date types.