SyncService rework