Add v3 support