Upgrade to v2.1