Working over discovery logic.