Add support for backwards compatibility.