Adding support for ONOFF type