Updated the plugin a bit more