Dataload refactoring