Improve persistence saving flow.