Added local storage capability