Working on updating the plugin to work with 3.0