Updated cage and investigator functionality