Small changes to the plugin