switch to new plugin handler