Added Thermostat support
Added appliance removal handling