Senior load refactor