Improvements for maintaining backward compatibility.