Upgrade for 0.20.0