More robust way to provide backwards compatibility.