Add restoreFromStorage option