Adding intelligent detection of current monitor.