Models now support the dates better