Initial work on updating the plugin script