Upgrade to v0.7