Refactor product loader