More work on the plugin framework