Added the plugin system