Improvements to loader
Loader optimizations