Add Support for Bundled Plugins