merge new plugin system