Enhancing the plugin