Add: idid support