Add state restoration to cells;