Improve persistence ownership handling.