Update with new ScopedPersistent interface.