Sync to new changes in original plugin
Update