Improve discovery