Updated for latest pluginbase changes.