Some modifications on this plugin system