senior dataload refactoring