changes to plugin system