Upgrade to 2.0.7 version