Add primitive hunting