Update for persistence support