added dateFormat and mapping