DataStorage now deals with DateTime properly