Add OTA support [2/2]