Refactor FileReference to DataReference