Use atomic save to avoid callbacks