Incorporate SyncRecord from Andrei.