more plugin system work