Switching v2 to be the default