Use new file API