[Improved] Use new plugin system