More updates to the plugin system.