Fixed Loader dynamic mode and cleaned code