Change dependency on Datetime to Dates