Add API v2 support