adding timestamp field support