no need for a regex .trim!
reorg
reorg
revert trim
clean up map
Added support for the Date datatype
Merging Data datatype change into upstream