Address Persist based on the work by @huoxito here a72608308e912b504289b4c9e30740b82dcee8f1