Tweaked the Plugin loader to do the same but with less code.