Added local storage support