Improved output file format