Continued working on persistance