New changes to the plugin