Improvements to the "Discovery & monitoring" concept