Add data file support