User/dataloader refactoring

Merged Federico Izzo requested to merge user/dataloader-refactoring into epic/data-processing-refactoring Sep 13, 2021