Adding support for individuals to have a different indiv_id and vcf_id