Refactored with new version of PluginBundle