Adopted to refactoring of IPersistencyHandler.