Added option to disable persistence completely.