Upgrade to 0.7