Add v7 library support