major simplification of the plugin system