Adding localStorage support