Added plugin_name arg