Update for new Plugin API (and not Module)