More data load refactoring.