Discovery improvement
Improve discovery | plugin currently broken