Updated to match new plugins.