add timestamp/date support