KRACOEUS-7005 : Begin adding support for non-employee lookup.