Add checks for backwards compatibility.