Improve updating dates and times