Add support for replay timestamp