move to new plugin system