Update to v2.0.7