Improved how core modules are pulled in.