add v2 support (default to v3)