Added more fields to Hunter:2007.