Updates to support local storage persistence