Add local storage (with some bug?)