Updated for the latest PluginBase changes.