3.0 - Fix persistent value, add missing options