Add zigbee and android