Finishing the persistence code