Refactored LocalStorageService