Add support for timestamping