Add 1.4 support