Updated local storage support