Upgrade to v3 version