Refactor loader little bit