Update two-way sync logic to support new events on remote server