Further work on persisting.