Added: better support for Dates in Mapper