ZWave binding and SwitchControl reworked