Added some new methods and Local Storage