Upgrade for v2.0.0.0 compatibility