Convert to new plugin system