Persistence example file + fixes