Improved the plugin