Persistence
Added some forgotten persistence stuff
Merge persistence