Update for changes in Send/Sync