Simplifying the plugin system.