Refactor the CSV output pathways to work with the new refactor and improve the granularity of the outputs