Update to avoid constructing deprecated list in writer.