Changes to use PluginFirstClassLoader