Added on/off monitoring