Updates for 7 plugin modules