Add data file handling