Update for new plugin API