Upgrade to v3.0.0