Merge the persistence package from Haohan