Improve replay prevention