Adding some retro-compatibility.