Made some changes to the plugin