Work on persistence package