Use new plugin system.