Adding local storage support