Update following new plugins features