Moved synch logic to data class