Refactor the background sync service