Move from Datetime dependency to Dates