Updated investigator functionality