Add IOTDM compatible feature back to Integration