- reimplement persistent handle code