Move more data loading code to DataLoader