Improve back compatibility.
7 files changed