Update data_loader to match new tag schema