Use new plugin code