Added generic switch and dimmer protocol