Updates for offline compatibility.