Changed the plugin system