Use new plugin system