Persisting changes correctly