Sync refactoring for multiple platforms