Modify Storage to match with TDTDateAndTime class