Upgrade to api v3