Junior dataload refactor