Moved the persistent store options around.