Added support for rc-switch