Change Datetime dependency to Dates