decompose now handles genotype fields and other changes