Simplify persistence of options