Serious reworking of the data flow through the loader.