More work on the sync service