Compatibility with older versions

API break replacements