Tweaked loader to use latest features