Updated discovery