BUG: Add data_file_path trait back in after getting nuked in merge