Add TODO for replay prevention