Update to use persistence callback