added cvv2_code (and added avs_code to build_subs)