Added monitoring of the valve class