Some work on the plugin