Take careful care of persistence modes