This patch focuses purely on data files.