Add v10 compatibility