Enhancing discovery with pattern matching

From C-7KDB897