Corrected persistence of dateTime
Updated transformToMap