Added support for the disable switch