Add 1.8 support