Improvement to the data format