Merge "Simplify maintaining the .dat file."