More work on the Plugin system