WIP: updating output files format.