Make program works with the new data format.