Port to new plugin-framework api