Updated discovery interfaces