Added support for on/off components.