Refactoring
Extend the persistor instance
Restore
Fix specs