modified event persistence