upgrade to API v3 support