Update to use new mentor field.