Add support for discover.
Add easy menu.
Merge branch 'discover'