Add 0.7.1 support