Rework the loader model