Add v4 support to libs