Update to last plugin system