Add 1.0.7 changes