Updated for latest PluginBase changes.