add v2 support (in progress)