Update how the plugin works a little bit, better use our tools