Added changes needed for IoT device enrollment