Overhaul of the plugin