Added local storage ability