Improved discovery