Upgrade wrapper to 2.0