Implement persist

Change-Id: I174768a493d5dbd43298343cb2750b4061d2d635