Improve monitoring management module