Added switch the device handler