Fix relations in data loader