Migrate to method that works for SyncSession