Fix 1.8 support and add backwards-compatibility.