Completed Persist Logic