Adding methods to LocalStorageController
Merge conflicts