Added LocalStorage support