Add 1.8.7 support