Changed string|DateTime to null|string|DateTime