Refactored to use SyncDataHelper