Fixed TODO and bug with PersistencyHandler.