HHH-7841 : Redesign Loader