Upgrade to v2.0