Updated forward-compatibility.