Minor changes in the output data format.