Changed API for datafile. DataFile now is a function datafile