Add a lot of PluginLoader improvements