Upgrade to datafiles - part 1