Persist API improvements