More work on the plugin manager