Improve InitialFlowWriter