Updated for libv2