Working on upgrading the plugin to 3.0