Changing the previous 'dates as strings' to be the more general type mapping