Added gen_hadt in MatchToGen