Upgrade to release v2.0