Finished refactoring for new loader scheme.