enhanced with better discovery information

Signed-off-by: Jim Klo <jim.klo@sri.com>