Update to use new plugins