Upgrade to datafiles - part 2