Better handle of _v2 functions