Upgrade to normalize v3.0.0