Update custom plugins to use new Plugin api