Enhance the monitor function