added date and null-value mapping