Attempting to add backwards compatibility.