Add v5 types, switch "raw" to "str"