Sync service refactoring. Specs