Dataloader Refactoring