Expand investigator's class