Added Local Storage handling for local data